just move the definition

sshnet · Jan 11, 2025 · 7efd655 · 7efd655
1 parent 4dcd67e
commit 7efd655
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 164 deletions.
diff --git a/src/Renci.SshNet/AuthenticationMethod.cs b/src/Renci.SshNet/AuthenticationMethod.cs
@@ -1,13 +1,6 @@
-<<<<<<< HEAD
-using Renci.SshNet.Common;
-using System;
-using System.Threading;
-using Renci.SshNet.Security.Org.BouncyCastle.Crypto.Parameters;
-=======
 using System;
 
 using Renci.SshNet.Common;
->>>>>>> develop
 
 namespace Renci.SshNet
 {
@@ -16,16 +9,6 @@ namespace Renci.SshNet
     /// </summary>
     public abstract class AuthenticationMethod : IAuthenticationMethod, IDisposable
     {
-        /// <summary>
-        /// Tracks result of current authentication process
-        /// </summary>
-	    protected AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
-
-        /// <summary>
-        /// Tracks completion of current authentication process
-        /// </summary>
-	    protected EventWaitHandle _authenticationCompleted = null;
-
         /// <summary>
         /// Gets the name of the authentication method.
         /// </summary>
@@ -58,45 +41,6 @@ protected AuthenticationMethod(string username)
             Username = username;
         }
 
-        #region IDisposable Members
-
-        private bool _isDisposed = 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 (_isDisposed)
-		        return;
-
-	        if (disposing)
-	        {
-		        var authenticationCompleted = _authenticationCompleted;
-		        if (authenticationCompleted != null)
-		        {
-			        authenticationCompleted.Dispose();
-			        _authenticationCompleted = null;
-		        }
-
-		        // Only if called with Dispose(true) otherwise we treat it is as not Disposed properly
-		        _isDisposed = true;
-	        }
-        }
-
-        #endregion
-
         /// <summary>
         /// Authenticates the specified session.
         /// </summary>
@@ -117,5 +61,23 @@ AuthenticationResult IAuthenticationMethod.Authenticate(ISession session)
         {
             return Authenticate((Session)session);
         }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        /// <see langword="true"/> to release both managed and unmanaged resources;
+        /// <see langword="false"/> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }
diff --git a/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs b/src/Renci.SshNet/KeyboardInteractiveAuthenticationMethod.cs
@@ -15,14 +15,10 @@ namespace Renci.SshNet
     /// </summary>
     public class KeyboardInteractiveAuthenticationMethod : AuthenticationMethod
     {
-<<<<<<< HEAD
-	    private Session _session;
-=======
         private readonly RequestMessageKeyboardInteractive _requestMessage;
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
         private Session _session;
         private EventWaitHandle _authenticationCompleted = new AutoResetEvent(initialState: false);
->>>>>>> develop
         private Exception _exception;
         private bool _isDisposed;
 
@@ -51,7 +47,6 @@ public KeyboardInteractiveAuthenticationMethod(string username)
             : base(username)
         {
             _requestMessage = new RequestMessageKeyboardInteractive(ServiceName.Connection, username);
-            _authenticationCompleted = new AutoResetEvent(false);
         }
 
         /// <summary>
@@ -155,23 +150,9 @@ private void Session_UserAuthenticationInformationRequestReceived(object sender,
                     }
                 });
         }
-<<<<<<< HEAD
-=======
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
         {
             if (_isDisposed)
             {
@@ -189,7 +170,8 @@ protected virtual void Dispose(bool disposing)
 
                 _isDisposed = true;
             }
+
+            base.Dispose(disposing);
         }
->>>>>>> develop
     }
 }
diff --git a/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs b/src/Renci.SshNet/KeyboardInteractiveConnectionInfo.cs
@@ -162,12 +162,9 @@ protected virtual void Dispose(bool disposing)
             {
                 if (AuthenticationMethods != null)
                 {
-                    foreach (var authenticationMethods in AuthenticationMethods)
+                    foreach (var authenticationMethod in AuthenticationMethods)
                     {
-                        if (authenticationMethods is IDisposable disposable)
-                        {
-                            disposable.Dispose();
-                        }
+                        authenticationMethod.Dispose();
                     }
                 }
 

diff --git a/src/Renci.SshNet/NoneAuthenticationMethod.cs b/src/Renci.SshNet/NoneAuthenticationMethod.cs
@@ -12,17 +12,12 @@ namespace Renci.SshNet
     /// </summary>
     public class NoneAuthenticationMethod : AuthenticationMethod
     {
-<<<<<<< HEAD
-	    /// <summary>
-        /// Gets connection name
-=======
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
         private EventWaitHandle _authenticationCompleted = new AutoResetEvent(initialState: false);
         private bool _isDisposed;
 
         /// <summary>
         /// Gets the name of the authentication method.
->>>>>>> develop
         /// </summary>
         public override string Name
         {
@@ -37,7 +32,6 @@ public override string Name
         public NoneAuthenticationMethod(string username)
             : base(username)
         {
-	        _authenticationCompleted = new AutoResetEvent(false);
         }
 
         /// <summary>
@@ -92,23 +86,9 @@ private void Session_UserAuthenticationFailureReceived(object sender, MessageEve
 
             _ = _authenticationCompleted.Set();
         }
-<<<<<<< HEAD
-=======
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
         {
             if (_isDisposed)
             {
@@ -126,7 +106,8 @@ protected virtual void Dispose(bool disposing)
 
                 _isDisposed = true;
             }
+
+            base.Dispose(disposing);
         }
->>>>>>> develop
     }
 }
diff --git a/src/Renci.SshNet/PasswordAuthenticationMethod.cs b/src/Renci.SshNet/PasswordAuthenticationMethod.cs
@@ -15,15 +15,11 @@ namespace Renci.SshNet
     /// </summary>
     public class PasswordAuthenticationMethod : AuthenticationMethod
     {
-<<<<<<< HEAD
-	    private Session _session;
-=======
         private readonly RequestMessagePassword _requestMessage;
         private readonly byte[] _password;
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
         private Session _session;
         private EventWaitHandle _authenticationCompleted = new AutoResetEvent(initialState: false);
->>>>>>> develop
         private Exception _exception;
         private bool _isDisposed;
 
@@ -61,7 +57,6 @@ internal byte[] Password
         public PasswordAuthenticationMethod(string username, string password)
             : this(username, Encoding.UTF8.GetBytes(password))
         {
-	        _authenticationCompleted = new AutoResetEvent(false);
         }
 
         /// <summary>
@@ -78,7 +73,6 @@ public PasswordAuthenticationMethod(string username, byte[] password)
 
             _password = password;
             _requestMessage = new RequestMessagePassword(ServiceName.Connection, Username, _password);
-            _authenticationCompleted = new AutoResetEvent(false);
         }
 
         /// <summary>
@@ -168,23 +162,9 @@ private void Session_UserAuthenticationPasswordChangeRequiredReceived(object sen
                 }
             });
         }
-<<<<<<< HEAD
-=======
 
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
         {
             if (_isDisposed)
             {
@@ -202,7 +182,8 @@ protected virtual void Dispose(bool disposing)
 
                 _isDisposed = true;
             }
+
+            base.Dispose(disposing);
         }
->>>>>>> develop
     }
 }
diff --git a/src/Renci.SshNet/PasswordConnectionInfo.cs b/src/Renci.SshNet/PasswordConnectionInfo.cs
@@ -281,10 +281,7 @@ protected virtual void Dispose(bool disposing)
                 {
                     foreach (var authenticationMethod in AuthenticationMethods)
                     {
-                        if (authenticationMethod is IDisposable disposable)
-                        {
-                            disposable.Dispose();
-                        }
+                        authenticationMethod.Dispose();
                     }
                 }
 

diff --git a/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs b/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
@@ -15,14 +15,10 @@ namespace Renci.SshNet
     /// </summary>
     public class PrivateKeyAuthenticationMethod : AuthenticationMethod
     {
-<<<<<<< HEAD
-	    private bool _isSignatureRequired;
-=======
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
         private EventWaitHandle _authenticationCompleted = new ManualResetEvent(initialState: false);
         private bool _isSignatureRequired;
         private bool _isDisposed;
->>>>>>> develop
 
         /// <summary>
         /// Gets the name of the authentication method.
@@ -48,12 +44,7 @@ public PrivateKeyAuthenticationMethod(string username, params IPrivateKeySource[
         {
             ThrowHelper.ThrowIfNull(keyFiles);
 
-<<<<<<< HEAD
-            KeyFiles = new Collection<PrivateKeyFile>(keyFiles);
-            _authenticationCompleted = new ManualResetEvent(false);
-=======
             KeyFiles = new Collection<IPrivateKeySource>(keyFiles);
->>>>>>> develop
         }
 
         /// <summary>
@@ -164,23 +155,8 @@ private void Session_UserAuthenticationPublicKeyReceived(object sender, MessageE
             _ = _authenticationCompleted.Set();
         }
 
-<<<<<<< HEAD
-        private class SignatureData : SshData
-=======
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
         {
             if (_isDisposed)
             {
@@ -198,10 +174,11 @@ protected virtual void Dispose(bool disposing)
 
                 _isDisposed = true;
             }
+
+            base.Dispose(disposing);
         }
 
         private sealed class SignatureData : SshData
->>>>>>> develop
         {
             private readonly RequestMessagePublicKey _message;
 

diff --git a/src/Renci.SshNet/PrivateKeyConnectionInfo.cs b/src/Renci.SshNet/PrivateKeyConnectionInfo.cs
@@ -160,10 +160,7 @@ protected virtual void Dispose(bool disposing)
                 {
                     foreach (var authenticationMethod in AuthenticationMethods)
                     {
-                        if (authenticationMethod is IDisposable disposable)
-                        {
-                            disposable.Dispose();
-                        }
+                        authenticationMethod.Dispose();
                     }
                 }