Changeset 1554 for branches/eraser6/CodeReview/Eraser.Util/Security.cs

Timestamp:

1/18/2010 5:38:32 AM (3 years ago)

Author:

lowjoel

Message:

Reviewed the SafeHandle? classes which we subclass. Also, don't implement IDisposable for CryptApi? since we use a global static instance. Addresses #284: Eraser.Util rewrite

File:

• branches/eraser6/CodeReview/Eraser.Util/Security.cs (modified) (5 diffs)

branches/eraser6/CodeReview/Eraser.Util/Security.cs

@@ -26 +26 @@
 using System.Security.Principal;
 using System.Runtime.InteropServices;
+using Microsoft.Win32.SafeHandles;
 
 namespace Eraser.Util
@@ -153 +154 @@
     }
 
-    internal sealed class CryptApi : IDisposable
+    internal sealed class CryptApi
     {
         /// <summary>
@@ -187 +188 @@
         }
 
-        #region IDisposable Members
-        ~CryptApi()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose(bool disposing)
-        {
-            if (disposing)
-                handle.Close();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-        #endregion
-
         /// <summary>
         /// The GenRandom function fills a buffer with cryptographically random bytes.
@@ -230 +212 @@
     }
 
-    internal class SafeCryptHandle : SafeHandle
+    internal class SafeCryptHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         public SafeCryptHandle()
-            : base(IntPtr.Zero, true)
-        {
-        }
-
-        public override bool IsInvalid
-        {
-            get { return handle == IntPtr.Zero; }
+            : base(true)
+        {
         }
 
@@ -250 +227 @@
     }
 
-    internal class SafeTokenHandle : SafeHandle
+    internal class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         public SafeTokenHandle()
-            : base(IntPtr.Zero, true)
-        {
-        }
-
-        public override bool IsInvalid
-        {
-            get { return handle == IntPtr.Zero; }
+            : base(true)
+        {
         }