diff options
Diffstat (limited to 'src/mscorlib/src/System/Security/securestring.cs')
-rw-r--r-- | src/mscorlib/src/System/Security/securestring.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mscorlib/src/System/Security/securestring.cs b/src/mscorlib/src/System/Security/securestring.cs index b53d0db5b4..548126f4d0 100644 --- a/src/mscorlib/src/System/Security/securestring.cs +++ b/src/mscorlib/src/System/Security/securestring.cs @@ -14,6 +14,7 @@ namespace System.Security { using System.Runtime.ConstrainedExecution; using System.Runtime.Versioning; using Microsoft.Win32.SafeHandles; + using System.Diagnostics; using System.Diagnostics.Contracts; public sealed class SecureString: IDisposable { @@ -105,15 +106,15 @@ namespace System.Security { [CLSCompliant(false)] public unsafe SecureString(char* value, int length) { if( value == null) { - throw new ArgumentNullException("value"); + throw new ArgumentNullException(nameof(value)); } if( length < 0) { - throw new ArgumentOutOfRangeException("length", Environment.GetResourceString("ArgumentOutOfRange_NeedNonNegNum")); + throw new ArgumentOutOfRangeException(nameof(length), Environment.GetResourceString("ArgumentOutOfRange_NeedNonNegNum")); } if( length > MaxLength) { - throw new ArgumentOutOfRangeException("length", Environment.GetResourceString("ArgumentOutOfRange_Length")); + throw new ArgumentOutOfRangeException(nameof(length), Environment.GetResourceString("ArgumentOutOfRange_Length")); } Contract.EndContractBlock(); @@ -192,7 +193,7 @@ namespace System.Security { #endif // FEATURE_CORRUPTING_EXCEPTIONS public void InsertAt( int index, char c ) { if( index < 0 || index > m_length) { - throw new ArgumentOutOfRangeException("index", Environment.GetResourceString("ArgumentOutOfRange_IndexString")); + throw new ArgumentOutOfRangeException(nameof(index), Environment.GetResourceString("ArgumentOutOfRange_IndexString")); } Contract.EndContractBlock(); @@ -251,7 +252,7 @@ namespace System.Security { EnsureNotReadOnly(); if( index < 0 || index >= m_length) { - throw new ArgumentOutOfRangeException("index", Environment.GetResourceString("ArgumentOutOfRange_IndexString")); + throw new ArgumentOutOfRangeException(nameof(index), Environment.GetResourceString("ArgumentOutOfRange_IndexString")); } unsafe @@ -290,10 +291,10 @@ namespace System.Security { #endif // FEATURE_CORRUPTING_EXCEPTIONS public void SetAt( int index, char c ) { if( index < 0 || index >= m_length) { - throw new ArgumentOutOfRangeException("index", Environment.GetResourceString("ArgumentOutOfRange_IndexString")); + throw new ArgumentOutOfRangeException(nameof(index), Environment.GetResourceString("ArgumentOutOfRange_IndexString")); } Contract.EndContractBlock(); - Contract.Assert(index <= Int32.MaxValue / sizeof(char)); + Debug.Assert(index <= Int32.MaxValue / sizeof(char)); EnsureNotDisposed(); EnsureNotReadOnly(); @@ -315,7 +316,7 @@ namespace System.Security { private int BufferLength { [System.Security.SecurityCritical] // auto-generated get { - Contract.Assert(m_buffer != null, "Buffer is not initialized!"); + Debug.Assert(m_buffer != null, "Buffer is not initialized!"); return m_buffer.Length; } } @@ -341,7 +342,7 @@ namespace System.Security { [System.Security.SecurityCritical] // auto-generated private void EnsureCapacity(int capacity) { if( capacity > MaxLength) { - throw new ArgumentOutOfRangeException("capacity", Environment.GetResourceString("ArgumentOutOfRange_Capacity")); + throw new ArgumentOutOfRangeException(nameof(capacity), Environment.GetResourceString("ArgumentOutOfRange_Capacity")); } Contract.EndContractBlock(); @@ -377,7 +378,7 @@ namespace System.Security { [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] private static uint GetAlignedSize( int size) { - Contract.Assert(size >= 0, "size must be non-negative"); + Debug.Assert(size >= 0, "size must be non-negative"); uint alignedSize = ((uint)size / BlockSize) * BlockSize; if( (size % BlockSize != 0) || size == 0) { // if size is 0, set allocated size to blocksize @@ -449,8 +450,8 @@ namespace System.Security { [System.Security.SecurityCritical] // auto-generated [ReliabilityContract(Consistency.MayCorruptInstance, Cer.MayFail)] private void ProtectMemory() { - Contract.Assert(!m_buffer.IsInvalid && m_buffer.Length != 0, "Invalid buffer!"); - Contract.Assert(m_buffer.Length % BlockSize == 0, "buffer length must be multiple of blocksize!"); + Debug.Assert(!m_buffer.IsInvalid && m_buffer.Length != 0, "Invalid buffer!"); + Debug.Assert(m_buffer.Length % BlockSize == 0, "buffer length must be multiple of blocksize!"); if( m_length == 0 || m_encrypted) { return; @@ -650,8 +651,8 @@ namespace System.Security { [System.Security.SecurityCritical] // auto-generated [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] private void UnProtectMemory() { - Contract.Assert(!m_buffer.IsInvalid && m_buffer.Length != 0, "Invalid buffer!"); - Contract.Assert(m_buffer.Length % BlockSize == 0, "buffer length must be multiple of blocksize!"); + Debug.Assert(!m_buffer.IsInvalid && m_buffer.Length != 0, "Invalid buffer!"); + Debug.Assert(m_buffer.Length % BlockSize == 0, "buffer length must be multiple of blocksize!"); if( m_length == 0) { return; @@ -733,7 +734,7 @@ namespace System.Security { source.AcquirePointer(ref sourcePtr); target.AcquirePointer(ref targetPtr); - Contract.Assert(Win32Native.SysStringLen((IntPtr)targetPtr) >= Win32Native.SysStringLen((IntPtr)sourcePtr), "Target buffer is not large enough!"); + Debug.Assert(Win32Native.SysStringLen((IntPtr)targetPtr) >= Win32Native.SysStringLen((IntPtr)sourcePtr), "Target buffer is not large enough!"); Buffer.Memcpy(targetPtr, sourcePtr, (int) Win32Native.SysStringLen((IntPtr)sourcePtr) * 2); } |