Make SafeHandle constructors public for internal types.

Make internal abstract SafeHandle default constructors protected. Make non-abstract internal SafeHandles sealed when possible. More internal SafeHandle types.
dotnet · Jan 19, 2021 · 923f6f5 · 923f6f5
1 parent 6efd06b
commit 923f6f5
Show file tree

Hide file tree

Showing 81 changed files with 98 additions and 102 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ISymWrapperCore.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/ISymWrapperCore.cs
@@ -502,7 +502,7 @@ private struct ISymUnmanagedWriter
     //--------------------------------------------------------------------------------------
     internal sealed class PunkSafeHandle : SafeHandle
     {
-        internal PunkSafeHandle()
+        public PunkSafeHandle()
             : base((IntPtr)0, true)
         {
         }

diff --git a/src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs b/src/coreclr/System.Private.CoreLib/src/System/TypeNameParser.cs
@@ -14,7 +14,7 @@
 
 namespace System
 {
-    internal class SafeTypeNameParserHandle : SafeHandleZeroOrMinusOneIsInvalid
+    internal sealed class SafeTypeNameParserHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         #region QCalls
         [DllImport(RuntimeHelpers.QCall, CharSet = CharSet.Unicode)]

diff --git a/src/installer/managed/Microsoft.NET.HostModel/ResourceUpdater.cs b/src/installer/managed/Microsoft.NET.HostModel/ResourceUpdater.cs
@@ -152,7 +152,7 @@ public static extern uint SizeofResource(IntPtr hModule,
         /// </summary>
         private class SafeUpdateHandle : SafeHandle
         {
-            private SafeUpdateHandle() : base(IntPtr.Zero, true)
+            public SafeUpdateHandle() : base(IntPtr.Zero, true)
             {
             }
 

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFArray.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFArray.cs
@@ -37,7 +37,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFArrayHandle : SafeHandle
     {
-        private SafeCFArrayHandle()
+        public SafeCFArrayHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFData.cs
@@ -86,7 +86,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFDataHandle : SafeHandle
     {
-        internal SafeCFDataHandle()
+        public SafeCFDataHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFDate.cs
@@ -49,7 +49,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFDateHandle : SafeHandle
     {
-        internal SafeCFDateHandle()
+        public SafeCFDateHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFDictionary.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFDictionary.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFDictionaryHandle : SafeHandle
     {
-        private SafeCFDictionaryHandle()
+        public SafeCFDictionaryHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFError.cs
@@ -52,7 +52,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFErrorHandle : SafeHandle
     {
-        internal SafeCFErrorHandle()
+        public SafeCFErrorHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs b/src/libraries/Common/src/Interop/OSX/Interop.CoreFoundation.CFString.cs
@@ -85,7 +85,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeCFStringHandle : SafeHandle
     {
-        internal SafeCFStringHandle()
+        public SafeCFStringHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...raries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Digest.cs b/...raries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Digest.cs
@@ -42,7 +42,7 @@ namespace System.Security.Cryptography.Apple
 {
     internal sealed class SafeDigestCtxHandle : SafeHandle
     {
-        internal SafeDigestCtxHandle()
+        public SafeDigestCtxHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...ibraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Hmac.cs b/...ibraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Hmac.cs
@@ -42,7 +42,7 @@ namespace System.Security.Cryptography.Apple
 {
     internal sealed class SafeHmacHandle : SafeHandle
     {
-        internal SafeHmacHandle()
+        public SafeHmacHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...ries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Keychain.cs b/...ries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Keychain.cs
@@ -292,7 +292,7 @@ namespace System.Security.Cryptography.Apple
 {
     internal class SafeKeychainItemHandle : SafeHandle
     {
-        internal SafeKeychainItemHandle()
+        public SafeKeychainItemHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }
@@ -310,7 +310,7 @@ protected override bool ReleaseHandle()
 
     internal class SafeKeychainHandle : SafeHandle
     {
-        internal SafeKeychainHandle()
+        public SafeKeychainHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs b/...libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Ssl.cs
@@ -412,7 +412,7 @@ namespace System.Net
 {
     internal sealed class SafeSslHandle : SafeHandle
     {
-        internal SafeSslHandle()
+        public SafeSslHandle()
             : base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...ies/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Symmetric.cs b/...ies/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.Symmetric.cs
@@ -83,7 +83,7 @@ internal static extern unsafe int CryptorFinal(
 
 namespace System.Security.Cryptography
 {
-    internal class SafeAppleCryptorHandle : SafeHandle
+    internal sealed class SafeAppleCryptorHandle : SafeHandle
     {
         public SafeAppleCryptorHandle()
             : base(IntPtr.Zero, ownsHandle: true)

diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OCSP.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OCSP.cs
@@ -101,7 +101,7 @@ internal static SafeOcspRequestHandle X509ChainBuildOcspRequest(SafeX509StoreCtx
 
 namespace System.Security.Cryptography.X509Certificates
 {
-    internal class SafeOcspRequestHandle : SafeHandleZeroOrMinusOneIsInvalid
+    internal sealed class SafeOcspRequestHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         public SafeOcspRequestHandle()
             : base(true)
@@ -116,7 +116,7 @@ protected override bool ReleaseHandle()
         }
     }
 
-    internal class SafeOcspResponseHandle : SafeHandleZeroOrMinusOneIsInvalid
+    internal sealed class SafeOcspResponseHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         public SafeOcspResponseHandle()
             : base(true)

diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
@@ -368,7 +368,7 @@ private void Disconnect()
             }
         }
 
-        private SafeSslHandle() : base(IntPtr.Zero, true)
+        public SafeSslHandle() : base(IntPtr.Zero, true)
         {
         }
 

diff --git a/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtx.cs b/src/libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.SslCtx.cs
@@ -64,7 +64,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeSslContextHandle : SafeHandle
     {
-        private SafeSslContextHandle()
+        public SafeSslContextHandle()
             : base(IntPtr.Zero, true)
         {
         }

diff --git a/...libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs b/...libraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Name.cs
@@ -49,7 +49,7 @@ namespace Microsoft.Win32.SafeHandles
     /// </summary>
     internal sealed class SafeSharedX509NameHandle : SafeInteriorHandle
     {
-        private SafeSharedX509NameHandle() :
+        public SafeSharedX509NameHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }
@@ -61,7 +61,7 @@ private SafeSharedX509NameHandle() :
     /// </summary>
     internal sealed class SafeSharedX509NameStackHandle : SafeInteriorHandle
     {
-        private SafeSharedX509NameStackHandle() :
+        public SafeSharedX509NameStackHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...ibraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Stack.cs b/...ibraries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509Stack.cs
@@ -63,7 +63,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeX509StackHandle : SafeHandle
     {
-        private SafeX509StackHandle() :
+        public SafeX509StackHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }
@@ -100,7 +100,7 @@ internal sealed class SafeSharedX509StackHandle : SafeInteriorHandle
     {
         internal static readonly SafeSharedX509StackHandle InvalidHandle = new SafeSharedX509StackHandle();
 
-        private SafeSharedX509StackHandle() :
+        public SafeSharedX509StackHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/...aries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509StoreCtx.cs b/...aries/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509StoreCtx.cs
@@ -75,7 +75,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeX509StoreCtxHandle : SafeHandle
     {
-        private SafeX509StoreCtxHandle() :
+        public SafeX509StoreCtxHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/SafeHashHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeHashHandle.cs
@@ -14,7 +14,7 @@ internal sealed class SafeHashHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         private SafeProvHandle? _parent;
 
-        private SafeHashHandle() : base(true)
+        public SafeHashHandle() : base(true)
         {
             SetHandle(IntPtr.Zero);
         }

diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/SafeKeyHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeKeyHandle.cs
@@ -23,7 +23,7 @@ internal sealed class SafeKeyHandle : SafeHandleZeroOrMinusOneIsInvalid
         private bool _fPublicOnly;
         private SafeProvHandle? _parent;
 
-        private SafeKeyHandle() : base(true)
+        public SafeKeyHandle() : base(true)
         {
             SetHandle(IntPtr.Zero);
             _keySpec = 0;

diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/SafeProvHandle.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/SafeProvHandle.cs
@@ -18,7 +18,7 @@ internal sealed class SafeProvHandle : SafeHandleZeroOrMinusOneIsInvalid
         private uint _flags;
         private bool _fPersistKeyInCsp;
 
-        private SafeProvHandle() : base(true)
+        public SafeProvHandle() : base(true)
         {
             SetHandle(IntPtr.Zero);
             _containerName = null;

diff --git a/src/libraries/Common/src/Interop/Windows/IpHlpApi/Interop.ICMP.cs b/src/libraries/Common/src/Interop/Windows/IpHlpApi/Interop.ICMP.cs
@@ -80,7 +80,7 @@ internal struct Icmp6EchoReply
 
         internal sealed class SafeCloseIcmpHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
-            private SafeCloseIcmpHandle() : base(true)
+            public SafeCloseIcmpHandle() : base(true)
             {
             }
 

diff --git a/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs b/src/libraries/Common/src/Interop/Windows/SspiCli/SecuritySafeHandles.cs
@@ -148,7 +148,7 @@ internal sealed class SafeFreeCertContext : SafeHandleZeroOrMinusOneIsInvalid
     {
 #endif
 
-        internal SafeFreeCertContext() : base(true) { }
+        public SafeFreeCertContext() : base(true) { }
 
         // This must be ONLY called from this file.
         internal void Set(IntPtr value)
@@ -1080,7 +1080,7 @@ internal static unsafe int ApplyControlToken(
 
     internal sealed class SafeDeleteSslContext : SafeDeleteContext
     {
-        internal SafeDeleteSslContext() : base() { }
+        public SafeDeleteSslContext() : base() { }
 
         protected override bool ReleaseHandle()
         {

diff --git a/src/libraries/Common/src/Interop/Windows/WinSock/SafeNativeOverlapped.cs b/src/libraries/Common/src/Interop/Windows/WinSock/SafeNativeOverlapped.cs
@@ -14,7 +14,7 @@ internal sealed class SafeNativeOverlapped : SafeHandle
     {
         private readonly SafeSocketHandle? _socketHandle;
 
-        private SafeNativeOverlapped()
+        public SafeNativeOverlapped()
             : this(IntPtr.Zero)
         {
             if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(this);

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/Asn1SafeHandles.Unix.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/Asn1SafeHandles.Unix.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeAsn1ObjectHandle : SafeHandle
     {
-        private SafeAsn1ObjectHandle() :
+        public SafeAsn1ObjectHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }
@@ -28,7 +28,7 @@ public override bool IsInvalid
 
     internal sealed class SafeAsn1BitStringHandle : SafeHandle
     {
-        private SafeAsn1BitStringHandle() :
+        public SafeAsn1BitStringHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }
@@ -48,7 +48,7 @@ public override bool IsInvalid
 
     internal sealed class SafeAsn1OctetStringHandle : SafeHandle
     {
-        private SafeAsn1OctetStringHandle() :
+        public SafeAsn1OctetStringHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs
@@ -61,7 +61,7 @@ protected override bool ReleaseHandle()
             return status == Interop.NetSecurityNative.Status.GSS_S_COMPLETE;
         }
 
-        private SafeGssNameHandle()
+        public SafeGssNameHandle()
             : base(IntPtr.Zero, true)
         {
         }
@@ -70,7 +70,7 @@ private SafeGssNameHandle()
     /// <summary>
     /// Wrapper around a gss_cred_id_t_desc_struct*
     /// </summary>
-    internal class SafeGssCredHandle : SafeHandle
+    internal sealed class SafeGssCredHandle : SafeHandle
     {
         private static readonly Lazy<bool> s_IsNtlmInstalled = new Lazy<bool>(InitIsNtlmInstalled);
 
@@ -132,7 +132,7 @@ public static SafeGssCredHandle Create(string username, string password, bool is
             return retHandle;
         }
 
-        private SafeGssCredHandle()
+        public SafeGssCredHandle()
             : base(IntPtr.Zero, true)
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptAlgorithmHandle.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptAlgorithmHandle.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeBCryptAlgorithmHandle : SafeBCryptHandle
     {
-        private SafeBCryptAlgorithmHandle()
+        public SafeBCryptAlgorithmHandle()
             : base()
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptHashHandle.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptHashHandle.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeBCryptHashHandle : SafeBCryptHandle
     {
-        private SafeBCryptHashHandle()
+        public SafeBCryptHashHandle()
             : base()
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptKeyHandle.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBCryptKeyHandle.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeBCryptKeyHandle : SafeBCryptHandle
     {
-        private SafeBCryptKeyHandle()
+        public SafeBCryptKeyHandle()
             : base()
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBignumHandle.Unix.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBignumHandle.Unix.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeBignumHandle : SafeHandle
     {
-        private SafeBignumHandle() :
+        public SafeBignumHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBioHandle.Unix.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeBioHandle.Unix.cs
@@ -13,7 +13,7 @@ internal sealed class SafeBioHandle : SafeHandle
     {
         private SafeHandle? _parent;
 
-        private SafeBioHandle() :
+        public SafeBioHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeCreateHandle.OSX.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeCreateHandle.OSX.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Win32.SafeHandles
     /// </summary>
     internal sealed partial class SafeCreateHandle : SafeHandle
     {
-        internal SafeCreateHandle() : base(IntPtr.Zero, true) { }
+        public SafeCreateHandle() : base(IntPtr.Zero, true) { }
 
         internal SafeCreateHandle(IntPtr ptr) : base(IntPtr.Zero, true)
         {

diff --git a/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeDsaHandle.Unix.cs b/src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeDsaHandle.Unix.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Win32.SafeHandles
 {
     internal sealed class SafeDsaHandle : SafeHandle
     {
-        private SafeDsaHandle() :
+        public SafeDsaHandle() :
             base(IntPtr.Zero, ownsHandle: true)
         {
         }