Convert project to .NET 4.8 and add Wrap and Unwrap functionality to Encrypt and Decrypt messages

The Dispose(bool) method will still act even if finalizing, but it armors its access to the server to ensure that it doesn't accidentally cause a nullref trying to revert itself.

.gitignore

@@ -1 +1,2 @@
 .vs
+/_ReSharper.Caches

License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Kevin Thompson
+Copyright (c) 2019, Kevin Thompson
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

NSspi.sln

@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 16.0.28527.54
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{E93FBF1A-5198-44D6-BDF0-880D17F2B81A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProtocol", "TestProtocol\TestProtocol.csproj", "{9BFD94E1-D9FB-44D7-A6E7-8BAC2620E535}"

NSspi/ByteWriter.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {
@@ -37,8 +32,7 @@ namespace NSspi
             buffer[position + 0] = (byte)( value >> 24 );
             buffer[position + 1] = (byte)( value >> 16 );
             buffer[position + 2] = (byte)( value >> 8 );
-            buffer[position + 3] = (byte)( value);
+            buffer[position + 3] = (byte)( value );
-
         }
 
         /// <summary>

NSspi/Contexts/ClientContext.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using NSspi.Buffers;
 using NSspi.Credentials;
 
@@ -33,7 +28,7 @@ namespace NSspi.Contexts
         /// <param name="requestedAttribs">Requested attributes that describe the desired properties of the
         /// context once it is established. If a context cannot be established that satisfies the indicated
         /// properties, the context initialization is aborted.</param>
-        public ClientContext( ClientCredential cred, string serverPrinc, ContextAttrib requestedAttribs )
+        public ClientContext( Credential cred, string serverPrinc, ContextAttrib requestedAttribs )
             : base( cred )
         {
             this.serverPrinc = serverPrinc;
@@ -90,12 +85,12 @@ namespace NSspi.Contexts
             // The security package tells us how big its biggest token will be. We'll allocate a buffer
             // that size, and it'll tell us how much it used.
             outTokenBuffer = new SecureBuffer(
-                new byte[ this.Credential.PackageInfo.MaxTokenLength ], 
+                new byte[this.Credential.PackageInfo.MaxTokenLength],
                 BufferType.Token
             );
 
             serverBuffer = null;
-            if ( serverToken != null )
+            if( serverToken != null )
             {
                 serverBuffer = new SecureBuffer( serverToken, BufferType.Token );
             }
@@ -115,9 +110,9 @@ namespace NSspi.Contexts
             //    Windows, 128 bits on 64-bit Windows.
             //  - So in the end, on a 64-bit machine, we're passing a 64-bit value (the pointer to the struct) that
             //    points to 128 bits of memory (the struct itself) for where to write the handle numbers.
-            using ( outAdapter = new SecureBufferAdapter( outTokenBuffer ) )
+            using( outAdapter = new SecureBufferAdapter( outTokenBuffer ) )
             {
-                if ( this.ContextHandle.IsInvalid )
+                if( this.ContextHandle.IsInvalid )
                 {
                     status = ContextNativeMethods.InitializeSecurityContext_1(
                         ref this.Credential.Handle.rawHandle,
@@ -136,7 +131,7 @@ namespace NSspi.Contexts
                 }
                 else
                 {
-                    using ( serverAdapter = new SecureBufferAdapter( serverBuffer ) )
+                    using( serverAdapter = new SecureBufferAdapter( serverBuffer ) )
                     {
                         status = ContextNativeMethods.InitializeSecurityContext_2(
                             ref this.Credential.Handle.rawHandle,

NSspi/Contexts/Context.cs

@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
+using System.Security.Principal;
-using System.Threading.Tasks;
 using NSspi.Buffers;
-using NSspi.Contexts;
 using NSspi.Credentials;
 
 namespace NSspi.Contexts
@@ -87,6 +83,11 @@ namespace NSspi.Contexts
         /// </summary>
         public bool Disposed { get; private set; }
 
+        /// <summary>
+        /// Constant for wrapping only...no encryption
+        /// </summary>
+        protected uint KERB_WRAP_NO_ENCRYPT = 0x80000001;
+
         /// <summary>
         /// Marks the context as having completed the initialization process, ie, exchanging of authentication tokens.
         /// </summary>
@@ -122,6 +123,105 @@ namespace NSspi.Contexts
             this.Disposed = true;
         }
 
+        /// <summary>
+        /// Returns the identity of the remote entity.
+        /// </summary>
+        /// <returns></returns>
+        public IIdentity GetRemoteIdentity()
+        {
+            IIdentity result = null;
+
+            using( var tokenHandle = GetContextToken() )
+            {
+                bool gotRef = false;
+
+                RuntimeHelpers.PrepareConstrainedRegions();
+                try
+                {
+                    tokenHandle.DangerousAddRef( ref gotRef );
+                }
+                catch( Exception )
+                {
+                    if( gotRef )
+                    {
+                        tokenHandle.DangerousRelease();
+                        gotRef = false;
+                    }
+
+                    throw;
+                }
+                finally
+                {
+                    try
+                    {
+                        result = new WindowsIdentity(
+                            tokenHandle.DangerousGetHandle(),
+                            this.Credential.SecurityPackage
+                        );
+                    }
+                    finally
+                    {
+                        // Make sure we release the handle, even if the allocation for
+                        // WindowsIdentity fails.
+                        tokenHandle.DangerousRelease();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private SafeTokenHandle GetContextToken()
+        {
+            bool gotRef = false;
+            SecurityStatus status = SecurityStatus.InternalError;
+            SafeTokenHandle token;
+
+            RuntimeHelpers.PrepareConstrainedRegions();
+            try
+            {
+                this.ContextHandle.DangerousAddRef( ref gotRef );
+            }
+            catch( Exception )
+            {
+                if( gotRef )
+                {
+                    this.ContextHandle.DangerousRelease();
+                    gotRef = false;
+                }
+
+                throw;
+            }
+            finally
+            {
+                if( gotRef )
+                {
+                    try
+                    {
+                        status = ContextNativeMethods.QuerySecurityContextToken(
+                            ref this.ContextHandle.rawHandle,
+                            out token
+                        );
+                    }
+                    finally
+                    {
+                        this.ContextHandle.DangerousRelease();
+                    }
+                }
+                else
+                {
+                    token = null;
+                }
+            }
+
+            if( status != SecurityStatus.OK )
+            {
+                throw new SSPIException( "Failed to query context token.", status );
+            }
+
+            return token;
+        }
+
         /// <summary>
         /// Encrypts the byte array using the context's session key.
         /// </summary>
@@ -135,8 +235,9 @@ namespace NSspi.Contexts
         ///  - The padding buffer.
         /// </remarks>
         /// <param name="input">The raw message to encrypt.</param>
+        /// <param name="wrapOnly">Only wrap the message, no encryption</param>
         /// <returns>The packed and encrypted message.</returns>
-        public byte[] Encrypt( byte[] input )
+        public byte[] Encrypt( byte[] input, bool wrapOnly = false )
         {
             // The message is encrypted in place in the buffer we provide to Win32 EncryptMessage
             SecPkgContext_Sizes sizes;
@@ -161,9 +262,14 @@ namespace NSspi.Contexts
 
             using( adapter = new SecureBufferAdapter( new[] { trailerBuffer, dataBuffer, paddingBuffer } ) )
             {
+                uint qualityOfProtection = 0u;
+                if (wrapOnly)
+                {
+                    qualityOfProtection = KERB_WRAP_NO_ENCRYPT;
+                }
                 status = ContextNativeMethods.SafeEncryptMessage(
                     this.ContextHandle,
-                    0,
+                    qualityOfProtection,
                     adapter,
                     0
                 );
@@ -217,8 +323,9 @@ namespace NSspi.Contexts
         ///  - The padding buffer.
         /// </remarks>
         /// <param name="input">The packed and encrypted data.</param>
+        /// <param name="unwrapOnly">Only wrap the message, no encryption</param>
         /// <returns>The original plaintext message.</returns>
-        public byte[] Decrypt( byte[] input )
+        public byte[] Decrypt( byte[] input, bool unwrapOnly = false)
         {
             SecPkgContext_Sizes sizes;
 
@@ -257,7 +364,7 @@ namespace NSspi.Contexts
             paddingLength = ByteWriter.ReadInt16_BE( input, position );
             position += 2;
 
-            if ( trailerLength + dataLength + paddingLength + 2 + 4 + 2 > input.Length )
+            if( trailerLength + dataLength + paddingLength + 2 + 4 + 2 > input.Length )
             {
                 throw new ArgumentException( "The buffer contains invalid data - the embedded length data does not add up." );
             }
@@ -296,12 +403,16 @@ namespace NSspi.Contexts
             }
             // else there was no padding.
 
-
+            using( adapter = new SecureBufferAdapter( new[] { trailerBuffer, dataBuffer, paddingBuffer } ) )
-            using( adapter = new SecureBufferAdapter( new [] { trailerBuffer, dataBuffer, paddingBuffer } ) )
             {
+                uint qualityOfProtection = 0u;
+                if (unwrapOnly)
+                {
+                    qualityOfProtection = KERB_WRAP_NO_ENCRYPT;
+                }
                 status = ContextNativeMethods.SafeDecryptMessage(
                     this.ContextHandle,
-                    0,
+                    qualityOfProtection,
                     adapter,
                     0
                 );
@@ -348,7 +459,7 @@ namespace NSspi.Contexts
 
             Array.Copy( message, dataBuffer.Buffer, message.Length );
 
-            using ( adapter = new SecureBufferAdapter( new[] { dataBuffer, signatureBuffer } ) )
+            using( adapter = new SecureBufferAdapter( new[] { dataBuffer, signatureBuffer } ) )
             {
                 status = ContextNativeMethods.SafeMakeSignature(
                     this.ContextHandle,
@@ -358,7 +469,7 @@ namespace NSspi.Contexts
                 );
             }
 
-            if ( status != SecurityStatus.OK )
+            if( status != SecurityStatus.OK )
             {
                 throw new SSPIException( "Failed to create message signature.", status );
             }
@@ -389,6 +500,35 @@ namespace NSspi.Contexts
             return outMessage;
         }
 
+        /// <summary>
+        /// Returns the Session Key from a context or null on failure.
+        /// </summary>
+        /// <remarks>
+        /// Session keys are sometimes needed for other purposes or HMAC functions. This function
+        /// will run QueryAttribute to get the session key struct, and read and return the key from
+        /// that struct.
+        /// </remarks>
+        /// <returns>byte[] with the session key data or null on failure</returns>
+        public byte[] QuerySessionKey()
+        {
+            SecurityStatus status;
+
+            byte[] SessionKey = null;
+
+            status = ContextNativeMethods.SafeQueryContextAttribute(
+                this.ContextHandle,
+                ContextQueryAttrib.SessionKey,
+                ref SessionKey
+            );
+
+            if( status != SecurityStatus.OK )
+            {
+                throw new SSPIException( "Failed to query session key.", status );
+            }
+
+            return SessionKey;
+        }
+
         /// <summary>
         /// Verifies the signature of a signed message
         /// </summary>
@@ -415,7 +555,7 @@ namespace NSspi.Contexts
 
             sizes = QueryBufferSizes();
 
-            if ( signedMessage.Length < 2 + 4 + sizes.MaxSignature )
+            if( signedMessage.Length < 2 + 4 + sizes.MaxSignature )
             {
                 throw new ArgumentException( "Input message is too small to possibly fit a valid message" );
             }
@@ -430,7 +570,7 @@ namespace NSspi.Contexts
             sigLen = ByteWriter.ReadInt16_BE( signedMessage, position );
             position += 2;
 
-            if ( messageLen + sigLen + 2 + 4 > signedMessage.Length )
+            if( messageLen + sigLen + 2 + 4 > signedMessage.Length )
             {
                 throw new ArgumentException( "The buffer contains invalid data - the embedded length data does not add up." );
             }
@@ -443,7 +583,7 @@ namespace NSspi.Contexts
             Array.Copy( signedMessage, position, signatureBuffer.Buffer, 0, sigLen );
             position += sigLen;
 
-            using ( adapter = new SecureBufferAdapter( new[] { dataBuffer, signatureBuffer } ) )
+            using( adapter = new SecureBufferAdapter( new[] { dataBuffer, signatureBuffer } ) )
             {
                 status = ContextNativeMethods.SafeVerifySignature(
                     this.ContextHandle,
@@ -453,12 +593,12 @@ namespace NSspi.Contexts
                 );
             }
 
-            if ( status == SecurityStatus.OK )
+            if( status == SecurityStatus.OK )
             {
                 origMessage = dataBuffer.Buffer;
                 return true;
             }
-            else if ( status == SecurityStatus.MessageAltered ||
+            else if( status == SecurityStatus.MessageAltered ||
                       status == SecurityStatus.OutOfSequence )
             {
                 origMessage = null;
@@ -485,9 +625,9 @@ namespace NSspi.Contexts
             {
                 this.ContextHandle.DangerousAddRef( ref gotRef );
             }
-            catch ( Exception )
+            catch( Exception )
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     this.ContextHandle.DangerousRelease();
                     gotRef = false;
@@ -497,7 +637,7 @@ namespace NSspi.Contexts
             }
             finally
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     status = ContextNativeMethods.QueryContextAttributes_Sizes(
                         ref this.ContextHandle.rawHandle,
@@ -521,7 +661,7 @@ namespace NSspi.Contexts
         /// </summary>
         /// <param name="attrib">The string-valued attribute to query.</param>
         /// <returns></returns>
-        private string QueryContextString(ContextQueryAttrib attrib)
+        private string QueryContextString( ContextQueryAttrib attrib )
         {
             SecPkgContext_String stringAttrib;
             SecurityStatus status = SecurityStatus.InternalError;
@@ -540,9 +680,9 @@ namespace NSspi.Contexts
             {
                 this.ContextHandle.DangerousAddRef( ref gotRef );
             }
-            catch ( Exception )
+            catch( Exception )
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     this.ContextHandle.DangerousRelease();
                     gotRef = false;
@@ -551,7 +691,7 @@ namespace NSspi.Contexts
             }
             finally
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     status = ContextNativeMethods.QueryContextAttributes_String(
                         ref this.ContextHandle.rawHandle,
@@ -561,7 +701,7 @@ namespace NSspi.Contexts
 
                     this.ContextHandle.DangerousRelease();
 
-                    if ( status == SecurityStatus.OK )
+                    if( status == SecurityStatus.OK )
                     {
                         result = Marshal.PtrToStringUni( stringAttrib.StringResult );
                         ContextNativeMethods.FreeContextBuffer( stringAttrib.StringResult );

NSspi/Contexts/ContextAttrib.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Contexts
 {
@@ -36,7 +32,6 @@ namespace NSspi.Contexts
         /// </summary>
         MutualAuth = 0x00000002,
 
-
         /// <summary>
         /// Detect replayed messages that have been encoded by using the EncryptMessage or MakeSignature
         /// message support functionality.
@@ -121,7 +116,16 @@ namespace NSspi.Contexts
         /// </summary>
         AcceptIntegrity = 0x00020000,
 
+        /// <summary>
+        /// Set by a client; indicates the context can only impersonate with limited privileges,
+        /// allowing the server only to identify the client when impersonating.
+        /// </summary>
         InitIdentify = 0x00020000,
+
+        /// <summary>
+        /// Set by a server; indicates the context can only impersonate with limited privileges,
+        /// allowing the server only to identify the client when impersonating.
+        /// </summary>
         AcceptIdentify = 0x00080000,
 
         /// <summary>

NSspi/Contexts/ContextNativeMethods.cs

@@ -1,13 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using NSspi.Buffers;
-using NSspi.Contexts;
 
 namespace NSspi.Contexts
 {
@@ -45,7 +40,7 @@ namespace NSspi.Contexts
         );
         */
 
-        [DllImport( "Secur32.dll", EntryPoint = "AcceptSecurityContext",CharSet = CharSet.Unicode )]
+        [DllImport( "Secur32.dll", EntryPoint = "AcceptSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus AcceptSecurityContext_1(
             ref RawSspiHandle credHandle,
             IntPtr oldContextHandle,
@@ -58,7 +53,6 @@ namespace NSspi.Contexts
             ref TimeStamp expiry
         );
 
-
         [DllImport( "Secur32.dll", EntryPoint = "AcceptSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus AcceptSecurityContext_2(
             ref RawSspiHandle credHandle,
@@ -72,7 +66,6 @@ namespace NSspi.Contexts
             ref TimeStamp expiry
         );
 
-
         [DllImport( "Secur32.dll", EntryPoint = "InitializeSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus InitializeSecurityContext_1(
             ref RawSspiHandle credentialHandle,
@@ -89,7 +82,6 @@ namespace NSspi.Contexts
             ref TimeStamp expiry
         );
 
-
         [DllImport( "Secur32.dll", EntryPoint = "InitializeSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus InitializeSecurityContext_2(
             ref RawSspiHandle credentialHandle,
@@ -106,18 +98,17 @@ namespace NSspi.Contexts
             ref TimeStamp expiry
         );
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success )]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "DeleteSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus DeleteSecurityContext( ref RawSspiHandle contextHandle );
 
-
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail )]
         [DllImport( "Secur32.dll", EntryPoint = "EncryptMessage", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus EncryptMessage(
             ref RawSspiHandle contextHandle,
-            int qualityOfProtection,
+            uint qualityOfProtection,
             IntPtr bufferDescriptor,
-            int sequenceNumber
+            uint sequenceNumber
         );
 
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
@@ -125,17 +116,17 @@ namespace NSspi.Contexts
         internal static extern SecurityStatus DecryptMessage(
             ref RawSspiHandle contextHandle,
             IntPtr bufferDescriptor,
-            int sequenceNumber,
+            uint sequenceNumber,
-            int qualityOfProtection
+            uint qualityOfProtection
         );
 
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
         [DllImport( "Secur32.dll", EntryPoint = "MakeSignature", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus MakeSignature(
             ref RawSspiHandle contextHandle,
-            int qualityOfProtection,
+            uint qualityOfProtection,
             IntPtr bufferDescriptor,
-            int sequenceNumber
+            uint sequenceNumber
         );
 
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
@@ -143,8 +134,8 @@ namespace NSspi.Contexts
         internal static extern SecurityStatus VerifySignature(
             ref RawSspiHandle contextHandle,
             IntPtr bufferDescriptor,
-            int sequenceNumber,
+            uint sequenceNumber,
-            int qualityOfProtection
+            uint qualityOfProtection
         );
 
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
@@ -155,7 +146,7 @@ namespace NSspi.Contexts
             ref SecPkgContext_Sizes sizes
         );
 
-        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "QueryContextAttributes", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus QueryContextAttributes_String(
             ref RawSspiHandle contextHandle,
@@ -163,11 +154,18 @@ namespace NSspi.Contexts
             ref SecPkgContext_String names
         );
 
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
+        [DllImport( "Secur32.dll", EntryPoint = "QueryContextAttributes", CharSet = CharSet.Unicode )]
+        internal static extern SecurityStatus QueryContextAttributes(
+           ref RawSspiHandle contextHandle,
+           ContextQueryAttrib attrib,
+           IntPtr attribute
+       );
+
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "FreeContextBuffer", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus FreeContextBuffer( IntPtr handle );
 
-
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "ImpersonateSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus ImpersonateSecurityContext( ref RawSspiHandle contextHandle );
@@ -176,6 +174,76 @@ namespace NSspi.Contexts
         [DllImport( "Secur32.dll", EntryPoint = "RevertSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus RevertSecurityContext( ref RawSspiHandle contextHandle );
 
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
+        [DllImport( "Secur32.dll", EntryPoint = "QuerySecurityContextToken", SetLastError = true )]
+        internal static extern SecurityStatus QuerySecurityContextToken( ref RawSspiHandle contextHandle, [Out] out SafeTokenHandle handle );
+
+        [StructLayout( LayoutKind.Sequential )]
+        private class KeyStruct
+        {
+            public int size;
+            public IntPtr data;
+        }
+
+        internal static SecurityStatus SafeQueryContextAttribute(
+            SafeContextHandle handle,
+            ContextQueryAttrib attribute,
+            ref byte[] buffer
+            )
+        {
+            bool gotRef = false;
+
+            SecurityStatus status = SecurityStatus.InternalError;
+            RuntimeHelpers.PrepareConstrainedRegions();
+
+            int pointerSize = System.Environment.Is64BitOperatingSystem ? 8 : 4; //NOTE: update this when 128 bit processors exist
+            IntPtr alloc_buffer = Marshal.AllocHGlobal( sizeof( uint ) + pointerSize ); //NOTE: this is at most 4 + sizeof(void*) bytes
+                                                                                        //see struct SecPkgContext_SessionKey
+                                                                                        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa380096(v=vs.85).aspx
+            try
+            {
+                handle.DangerousAddRef( ref gotRef );
+            }
+            catch( Exception )
+            {
+                if( gotRef )
+                {
+                    handle.DangerousRelease();
+                    gotRef = false;
+                    buffer = null;
+                }
+
+                throw;
+            }
+            finally
+            {
+                if( gotRef )
+                {
+                    status = ContextNativeMethods.QueryContextAttributes(
+                        ref handle.rawHandle,
+                        attribute,
+                        alloc_buffer
+                    );
+                    if( status == SecurityStatus.OK )
+                    {
+                        KeyStruct key = new KeyStruct();
+
+                        Marshal.PtrToStructure( alloc_buffer, key ); // fit to the proper size, read a byte[]
+
+                        byte[] sizedBuffer = new byte[key.size];
+
+                        for( int i = 0; i < key.size; i++ )
+                            sizedBuffer[i] = Marshal.ReadByte( key.data, i );
+
+                        buffer = sizedBuffer;
+                    }
+                    handle.DangerousRelease();
+                }
+            }
+            Marshal.FreeHGlobal( alloc_buffer );
+            return status;
+        }
+
         /// <summary>
         /// Safely invokes the native EncryptMessage function, making sure that handle ref counting is
         /// performed in a proper CER.
@@ -187,9 +255,9 @@ namespace NSspi.Contexts
         /// <returns></returns>
         internal static SecurityStatus SafeEncryptMessage(
             SafeContextHandle handle,
-            int qualityOfProtection,
+            uint qualityOfProtection,
             SecureBufferAdapter bufferAdapter,
-            int sequenceNumber )
+            uint sequenceNumber )
         {
             SecurityStatus status = SecurityStatus.InternalError;
             bool gotRef = false;
@@ -199,9 +267,9 @@ namespace NSspi.Contexts
             {
                 handle.DangerousAddRef( ref gotRef );
             }
-            catch ( Exception )
+            catch( Exception )
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     handle.DangerousRelease();
                     gotRef = false;
@@ -211,7 +279,7 @@ namespace NSspi.Contexts
             }
             finally
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     status = ContextNativeMethods.EncryptMessage(
                         ref handle.rawHandle,
@@ -238,9 +306,9 @@ namespace NSspi.Contexts
         /// <returns></returns>
         internal static SecurityStatus SafeDecryptMessage(
             SafeContextHandle handle,
-            int qualityOfProtection, 
+            uint qualityOfProtection,
             SecureBufferAdapter bufferAdapter,
-            int sequenceNumber )
+            uint sequenceNumber )
         {
             SecurityStatus status = SecurityStatus.InvalidHandle;
             bool gotRef = false;
@@ -289,9 +357,9 @@ namespace NSspi.Contexts
         /// <returns></returns>
         internal static SecurityStatus SafeMakeSignature(
             SafeContextHandle handle,
-            int qualityOfProtection,
+            uint qualityOfProtection,
             SecureBufferAdapter adapter,
-            int sequenceNumber )
+            uint sequenceNumber )
         {
             bool gotRef = false;
             SecurityStatus status = SecurityStatus.InternalError;
@@ -301,9 +369,9 @@ namespace NSspi.Contexts
             {
                 handle.DangerousAddRef( ref gotRef );
             }
-            catch ( Exception )
+            catch( Exception )
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     handle.DangerousRelease();
                     gotRef = false;
@@ -313,7 +381,7 @@ namespace NSspi.Contexts
             }
             finally
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     status = ContextNativeMethods.MakeSignature(
                         ref handle.rawHandle,
@@ -340,9 +408,9 @@ namespace NSspi.Contexts
         /// <returns></returns>
         internal static SecurityStatus SafeVerifySignature(
             SafeContextHandle handle,
-            int qualityOfProtection,
+            uint qualityOfProtection,
             SecureBufferAdapter adapter,
-            int sequenceNumber )
+            uint sequenceNumber )
         {
             bool gotRef = false;
             SecurityStatus status = SecurityStatus.InternalError;
@@ -352,9 +420,9 @@ namespace NSspi.Contexts
             {
                 handle.DangerousAddRef( ref gotRef );
             }
-            catch ( Exception )
+            catch( Exception )
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     handle.DangerousRelease();
                     gotRef = false;
@@ -364,7 +432,7 @@ namespace NSspi.Contexts
             }
             finally
             {
-                if ( gotRef )
+                if( gotRef )
                 {
                     status = ContextNativeMethods.VerifySignature(
                         ref handle.rawHandle,

NSspi/Contexts/ContextQueries.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Contexts
 {

NSspi/Contexts/ContextQueryAttrib.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Contexts
 {
@@ -36,5 +32,15 @@ namespace NSspi.Contexts
         /// Results for a query of this type are stored in a Win32 SecPkgContext_Authority structure.
         /// </remarks>
         Authority = 6,
+
+        /// <summary>
+        /// Queries the context for it's neogtiated SessionKey
+        /// </summary>
+        /// <remarks>
+        /// Results for a query of this type are stored in a Win32 SecPkgContext_SessionKey structure
+        /// </remarks>
+        SessionKey = 9,
+
+        AccessToken = 13, //not implemented yet but this would be cool
     }
 }

NSspi/Contexts/ImpersonationHandle.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
+using System.Security.Principal;
-using System.Linq;
+using System.Threading;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Contexts
 {
@@ -20,26 +18,30 @@ namespace NSspi.Contexts
     /// </remarks>
     public class ImpersonationHandle : IDisposable
     {
+        private readonly ServerContext server;
+
         private bool disposed;
-        private ServerContext server;
 
         /// <summary>
         /// Initializes a new instance of the ImpersonationHandle. Does not perform impersonation.
         /// </summary>
         /// <param name="server">The server context that is performing impersonation.</param>
-        internal ImpersonationHandle(ServerContext server)
+        internal ImpersonationHandle( ServerContext server )
         {
             this.server = server;
             this.disposed = false;
         }
 
+        /// <summary>
+        /// Finalizes the ImpersonationHandle by reverting the impersonation.
+        /// </summary>
         ~ImpersonationHandle()
         {
             Dispose( false );
         }
 
         /// <summary>
-        /// Reverts the impersonation.
+        /// Reverts impersonation.
         /// </summary>
         public void Dispose()
         {
@@ -47,13 +49,28 @@ namespace NSspi.Contexts
             GC.SuppressFinalize( this );
         }
 
-        protected virtual void Dispose( bool disposing )
+        /// <summary>
+        /// Reverts impersonation.
+        /// </summary>
+        /// <param name="disposing">True if being disposed, false if being finalized.</param>
+        private void Dispose( bool disposing )
         {
-            if( disposing && this.disposed == false && this.server != null && this.server.Disposed == false )
+            // This implements a variant of the typical dispose pattern. Always try to revert
-            {
+            // impersonation, even if finalizing. Don't do anything if we're already reverted.
-                this.server.RevertImpersonate();
-            }
-        }
 
+            if( this.disposed == false )
+            {
+                this.disposed = true;
+
+                // Just in case the reference is being pulled out from under us, pull a stable copy
+                // of the reference while we're null-checking.
+                var serverCopy = this.server;
+
+                if( serverCopy != null && serverCopy.Disposed == false )
+                {
+                    serverCopy.RevertImpersonate();
+                }
+            }
+        }
     }
 }

NSspi/Contexts/SafeContextHandle.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.ConstrainedExecution;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Contexts
 {
@@ -12,10 +8,17 @@ namespace NSspi.Contexts
     /// </summary>
     public class SafeContextHandle : SafeSspiHandle
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SafeContextHandle"/> class.
+        /// </summary>
         public SafeContextHandle()
             : base()
         { }
 
+        /// <summary>
+        /// Releases the safe context handle.
+        /// </summary>
+        /// <returns></returns>
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         protected override bool ReleaseHandle()
         {

NSspi/Contexts/SafeTokenHandle.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace NSspi.Contexts
+{
+    public class SafeTokenHandle : SafeHandle
+    {
+        public SafeTokenHandle() : base( IntPtr.Zero, true )
+        {
+        }
+
+        public override bool IsInvalid
+        {
+            get
+            {
+                return handle == IntPtr.Zero || handle == new IntPtr( -1 );
+            }
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            NativeMethods.CloseHandle( this.handle );
+
+            return true;
+        }
+    }
+}

NSspi/Contexts/ServerContext.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
+using System.Security.Principal;
-using System.Threading.Tasks;
+using System.Threading;
 using NSspi.Buffers;
 using NSspi.Credentials;
 
@@ -14,20 +12,27 @@ namespace NSspi.Contexts
     /// </summary>
     public class ServerContext : Context
     {
-        private ContextAttrib requestedAttribs;
+        private readonly ContextAttrib requestedAttribs;
-        private ContextAttrib finalAttribs;
+        private readonly bool impersonationSetsThreadPrinciple;
 
+        private ContextAttrib finalAttribs;
         private bool impersonating;
 
         /// <summary>
-        /// Performs basic initialization of a new instance of the ServerContext class. The ServerContext
+        /// Performs basic initialization of a new instance of the ServerContext class. The
-        /// is not ready for message manipulation until a security context has been established with a client.
+        /// ServerContext is not ready for message manipulation until a security context has been
+        /// established with a client.
         /// </summary>
         /// <param name="cred"></param>
         /// <param name="requestedAttribs"></param>
-        public ServerContext(ServerCredential cred, ContextAttrib requestedAttribs) : base ( cred )
+        /// <param name="impersonationSetsThreadPrinciple">
+        /// If true, the `Thread.CurrentPrinciple` property will be modified by successful impersonation.
+        /// </param>
+        public ServerContext( Credential cred, ContextAttrib requestedAttribs, bool impersonationSetsThreadPrinciple = false ) : base( cred )
         {
             this.requestedAttribs = requestedAttribs;
+            this.impersonationSetsThreadPrinciple = impersonationSetsThreadPrinciple;
+
             this.finalAttribs = ContextAttrib.Zero;
 
             this.impersonating = false;
@@ -90,13 +95,13 @@ namespace NSspi.Contexts
             clientBuffer = new SecureBuffer( clientToken, BufferType.Token );
 
             outBuffer = new SecureBuffer(
-                new byte[ this.Credential.PackageInfo.MaxTokenLength ], 
+                new byte[this.Credential.PackageInfo.MaxTokenLength],
                 BufferType.Token
             );
 
-            using ( clientAdapter = new SecureBufferAdapter( clientBuffer ) )
+            using( clientAdapter = new SecureBufferAdapter( clientBuffer ) )
             {
-                using ( outAdapter = new SecureBufferAdapter( outBuffer ) )
+                using( outAdapter = new SecureBufferAdapter( outBuffer ) )
                 {
                     if( this.ContextHandle.IsInvalid )
                     {
@@ -125,19 +130,15 @@ namespace NSspi.Contexts
                             ref this.finalAttribs,
                             ref rawExpiry
                         );
-
-
                     }
                 }
             }
 
-            if ( status == SecurityStatus.OK )
+            if( status == SecurityStatus.OK )
             {
-                nextToken = null;
-
                 base.Initialize( rawExpiry.ToDateTime() );
 
-                if ( outBuffer.Length != 0 )
+                if( outBuffer.Length != 0 )
                 {
                     nextToken = new byte[outBuffer.Length];
                     Array.Copy( outBuffer.Buffer, nextToken, nextToken.Length );
@@ -147,7 +148,7 @@ namespace NSspi.Contexts
                     nextToken = null;
                 }
             }
-            else if ( status == SecurityStatus.ContinueNeeded )
+            else if( status == SecurityStatus.ContinueNeeded )
             {
                 nextToken = new byte[outBuffer.Length];
                 Array.Copy( outBuffer.Buffer, nextToken, nextToken.Length );
@@ -226,7 +227,7 @@ namespace NSspi.Contexts
 
                     this.ContextHandle.DangerousRelease();
 
-                    this.impersonating = true;
+                    this.impersonating = status == SecurityStatus.OK;
                 }
             }
 
@@ -243,6 +244,11 @@ namespace NSspi.Contexts
                 throw new SSPIException( "Failed to impersonate the client", status );
             }
 
+            if( this.impersonating && this.impersonationSetsThreadPrinciple )
+            {
+                Thread.CurrentPrincipal = new WindowsPrincipal( (WindowsIdentity)GetRemoteIdentity() );
+            }
+
             return handle;
         }
 
@@ -288,6 +294,10 @@ namespace NSspi.Contexts
             }
         }
 
+        /// <summary>
+        /// Releases all resources associted with the ServerContext.
+        /// </summary>
+        /// <param name="disposing"></param>
         protected override void Dispose( bool disposing )
         {
             // We were disposed while impersonating. This means that the consumer that is currently holding

NSspi/Credentials/AuthData.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace NSspi.Credentials
+{
+    /// <summary>
+    /// Provides authentication data in native method calls.
+    /// </summary>
+    /// <remarks>
+    /// Implements the 'SEC_WINNT_AUTH_IDENTITY' structure. See:
+    ///
+    /// https://msdn.microsoft.com/en-us/library/windows/desktop/aa380131(v=vs.85).aspx
+    /// </remarks>
+    [StructLayout( LayoutKind.Sequential )]
+    internal struct NativeAuthData
+    {
+        public NativeAuthData( string domain, string username, string password, NativeAuthDataFlag flag )
+        {
+            this.Domain = domain;
+            this.DomainLength = domain.Length;
+
+            this.User = username;
+            this.UserLength = username.Length;
+
+            this.Password = password;
+            this.PasswordLength = password.Length;
+
+            this.Flags = flag;
+        }
+
+        [MarshalAs( UnmanagedType.LPWStr )]
+        public string User;
+
+        public int UserLength;
+
+        [MarshalAs( UnmanagedType.LPWStr )]
+        public string Domain;
+
+        public int DomainLength;
+
+        [MarshalAs( UnmanagedType.LPWStr )]
+        public string Password;
+
+        public int PasswordLength;
+
+        public NativeAuthDataFlag Flags;
+    }
+
+    internal enum NativeAuthDataFlag : int
+    {
+        Ansi = 1,
+
+        Unicode = 2
+    }
+}

NSspi/Credentials/ClientCredential.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace NSspi.Credentials
-{
-    /// <summary>
-    /// Represents the credentials of the user running the current process, for use as an SSPI client.
-    /// </summary>
-    public class ClientCredential : CurrentCredential
-    {
-        /// <summary>
-        /// Initializes a new instance of the ClientCredential class.
-        /// </summary>
-        /// <param name="package">The security package to acquire the credential handle from.</param>
-        public ClientCredential( string package )
-            : base( package, CredentialUse.Outbound )
-        {
-        }
-    }
-}

NSspi/Credentials/ClientCurrentCredential.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace NSspi.Credentials
+{
+    /// <summary>
+    /// Represents a handle to the credentials of the user running the current process, to be used to
+    /// authenticate as a client.
+    /// </summary>
+    public class ClientCurrentCredential : CurrentCredential
+    {
+        /// <summary>
+        /// Initializes a new instance of the ClientCurrentCredential class.
+        /// </summary>
+        /// <param name="package">The security package to acquire the credential handle from.</param>
+        public ClientCurrentCredential( string package )
+            : base( package, CredentialUse.Outbound )
+        {
+        }
+    }
+}

NSspi/Credentials/Credential.cs

@@ -1,13 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.DirectoryServices.AccountManagement;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using NSspi.Credentials;
 
 namespace NSspi.Credentials
 {
@@ -16,16 +9,16 @@ namespace NSspi.Credentials
     /// </summary>
     public class Credential : IDisposable
     {
+        /// <summary>
+        /// The name of the security package that controls the credential.
+        /// </summary>
+        private readonly string securityPackage;
+        
         /// <summary>
         /// Whether the Credential has been disposed.
         /// </summary>
         private bool disposed;
 
-        /// <summary>
-        /// The name of the security package that controls the credential.
-        /// </summary>
-        private string securityPackage;
-
         /// <summary>
         /// A safe handle to the credential's handle.
         /// </summary>
@@ -42,11 +35,10 @@ namespace NSspi.Credentials
         /// <param name="package">The security package to acquire the credential from.</param>
         public Credential( string package )
         {
-            this.disposed = false;
             this.securityPackage = package;
 
+            this.disposed = false;
             this.expiry = DateTime.MinValue;
-
             this.PackageInfo = PackageSupport.GetPackageCapabilities( this.SecurityPackage );
         }
 
@@ -185,11 +177,15 @@ namespace NSspi.Credentials
             GC.SuppressFinalize( this );
         }
 
+        /// <summary>
+        /// Releases all resources associted with the credential.
+        /// </summary>
+        /// <param name="disposing"></param>
         protected virtual void Dispose( bool disposing )
         {
-            if ( this.disposed == false )
+            if( this.disposed == false )
             {
-                if ( disposing )
+                if( disposing )
                 {
                     this.safeCredHandle.Dispose();
                 }

NSspi/Credentials/CredentialNativeMethods.cs

@@ -1,17 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using NSspi.Credentials;
 
 namespace NSspi.Credentials
 {
     internal static class CredentialNativeMethods
     {
-        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail)]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
         [DllImport( "Secur32.dll", EntryPoint = "AcquireCredentialsHandle", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus AcquireCredentialsHandle(
             string principleName,
@@ -25,13 +20,27 @@ namespace NSspi.Credentials
             ref TimeStamp expiry
         );
 
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
+        [DllImport( "Secur32.dll", EntryPoint = "AcquireCredentialsHandle", CharSet = CharSet.Unicode )]
+        internal static extern SecurityStatus AcquireCredentialsHandle_AuthData(
+            string principleName,
+            string packageName,
+            CredentialUse credentialUse,
+            IntPtr loginId,
+            ref NativeAuthData authData,
+            IntPtr getKeyFunc,
+            IntPtr getKeyData,
+            ref RawSspiHandle credentialHandle,
+            ref TimeStamp expiry
+        );
+
+
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "FreeCredentialsHandle", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus FreeCredentialsHandle(
             ref RawSspiHandle credentialHandle
         );
 
-
         /// <summary>
         /// The overload of the QueryCredentialsAttribute method that is used for querying the name attribute.
         /// In this call, it takes a void* to a structure that contains a wide char pointer. The wide character

NSspi/Credentials/CredentialQueryAttrib.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {

NSspi/Credentials/CredentialUse.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {

NSspi/Credentials/CurrentCredential.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {
@@ -57,13 +53,12 @@ namespace NSspi.Credentials
                );
             }
 
-            if ( status != SecurityStatus.OK )
+            if( status != SecurityStatus.OK )
             {
                 throw new SSPIException( "Failed to call AcquireCredentialHandle", status );
             }
 
             this.Expiry = rawExpiry.ToDateTime();
         }
-
     }
 }

NSspi/Credentials/PasswordCredential.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace NSspi.Credentials
+{
+    /// <summary>
+    /// Represents credentials acquired by providing a username, password, and domain.
+    /// </summary>
+    public class PasswordCredential : Credential
+    {
+        /// <summary>
+        /// Initializes a new instance of the PasswordCredential class.
+        /// </summary>
+        /// <remarks>
+        /// It is possible to acquire a valid handle to credentials that do not provide a valid
+        /// username-password combination. The username and password are not validation until the
+        /// authentication cycle begins.
+        /// </remarks>
+        /// <param name="domain">The domain to authenticate to.</param>
+        /// <param name="username">The username of the user to authenticate as.</param>
+        /// <param name="password">The user's password.</param>
+        /// <param name="secPackage">The SSPI security package to create credentials for.</param>
+        /// <param name="use">
+        /// Specify inbound when acquiring credentials for a server; outbound for a client.
+        /// </param>
+        public PasswordCredential( string domain, string username, string password, string secPackage, CredentialUse use ) 
+            : base( secPackage )
+        {
+            NativeAuthData authData = new NativeAuthData( domain, username, password, NativeAuthDataFlag.Unicode );
+
+            Init( authData, secPackage, use );
+        }
+
+        private void Init( NativeAuthData authData, string secPackage, CredentialUse use )
+        {
+            string packageName;
+            TimeStamp rawExpiry = new TimeStamp();
+            SecurityStatus status = SecurityStatus.InternalError;
+
+            // -- Package --
+            // Copy off for the call, since this.SecurityPackage is a property.
+            packageName = this.SecurityPackage;
+
+            this.Handle = new SafeCredentialHandle();
+
+
+            // The finally clause is the actual constrained region. The VM pre-allocates any stack space,
+            // performs any allocations it needs to prepare methods for execution, and postpones any
+            // instances of the 'uncatchable' exceptions (ThreadAbort, StackOverflow, OutOfMemory).
+            RuntimeHelpers.PrepareConstrainedRegions();
+            try { }
+            finally
+            {
+                status = CredentialNativeMethods.AcquireCredentialsHandle_AuthData(
+                   null,
+                   packageName,
+                   use,
+                   IntPtr.Zero,
+                   ref authData,
+                   IntPtr.Zero,
+                   IntPtr.Zero,
+                   ref this.Handle.rawHandle,
+                   ref rawExpiry
+               );
+            }
+
+            if( status != SecurityStatus.OK )
+            {
+                throw new SSPIException( "Failed to call AcquireCredentialHandle", status );
+            }
+
+            this.Expiry = rawExpiry.ToDateTime();
+        }
+    }
+}

NSspi/Credentials/QueryNameSupport.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {

NSspi/Credentials/SafeCredentialHandle.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.ConstrainedExecution;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {
@@ -12,10 +8,17 @@ namespace NSspi.Credentials
     /// </summary>
     public class SafeCredentialHandle : SafeSspiHandle
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SafeCredentialHandle"/> class.
+        /// </summary>
         public SafeCredentialHandle()
             : base()
         { }
 
+        /// <summary>
+        /// Releases the resources held by the credential handle.
+        /// </summary>
+        /// <returns></returns>
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         protected override bool ReleaseHandle()
         {
@@ -28,5 +31,4 @@ namespace NSspi.Credentials
             return status == SecurityStatus.OK;
         }
     }
-
 }

NSspi/Credentials/ServerCurrentCredential.cs

@@ -1,23 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Credentials
 {
     /// <summary>
-    /// Represents the credentials of the user running the current process, for use as an SSPI server.
+    /// Represents a handle to the credentials of the user running the current process, to be used to
+    /// authenticate as a server.
     /// </summary>
-    public class ServerCredential : CurrentCredential
+    public class ServerCurrentCredential : CurrentCredential
     {
         /// <summary>
         /// Initializes a new instance of the ServerCredential class, acquiring credentials from
         /// the current thread's security context.
         /// </summary>
         /// <param name="package">The name of the security package to obtain credentials from.</param>
-        public ServerCredential( string package )
+        public ServerCurrentCredential( string package )
             : base( package, CredentialUse.Inbound )
         {
         }

NSspi/EnumMgr.cs

@@ -1,24 +1,40 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace NSspi
 {
+    /// <summary>
+    /// Tags an enumeration member with a string that can be programmatically accessed.
+    /// </summary>
     [AttributeUsage( AttributeTargets.Field )]
     public class EnumStringAttribute : Attribute
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnumStringAttribute"/> class.
+        /// </summary>
+        /// <param name="text">The string to associate with the enumeration member.</param>
         public EnumStringAttribute( string text )
         {
             this.Text = text;
         }
 
+        /// <summary>
+        /// Gets the string associated with the enumeration member.
+        /// </summary>
         public string Text { get; private set; }
     }
 
+    /// <summary>
+    /// Converts betwen enumeration members and the strings associated to the members through the
+    /// <see cref="EnumStringAttribute"/> type.
+    /// </summary>
     public class EnumMgr
     {
+        /// <summary>
+        /// Gets the text associated with the given enumeration member through a <see cref="EnumStringAttribute"/>.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
         public static string ToText( Enum value )
         {
             FieldInfo field = value.GetType().GetField( value.ToString() );
@@ -35,6 +51,12 @@ namespace NSspi
             }
         }
 
+        /// <summary>
+        /// Returns the enumeration member that is tagged with the given text using the <see cref="EnumStringAttribute"/> type.
+        /// </summary>
+        /// <typeparam name="T">The enumeration type to inspect.</typeparam>
+        /// <param name="text"></param>
+        /// <returns></returns>
         public static T FromText<T>( string text )
         {
             FieldInfo[] fields = typeof( T ).GetFields();

NSspi/NSspi.csproj

@@ -1,94 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4B4CD933-BF62-4F92-B8FA-6771758C5197}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NSspi</RootNamespace>
     <AssemblyName>NSspi</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <FileAlignment>512</FileAlignment>
+    <Authors>Kevin Thompson</Authors>
-    <TargetFrameworkProfile />
+    <PackageReleaseNotes>Adds support for accessing the remote identity.</PackageReleaseNotes>
-  </PropertyGroup>
+    <PackageProjectUrl>https://github.com/antiduh/nsspi</PackageProjectUrl>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>0.3.1.0</Version>
-    <DebugSymbols>true</DebugSymbols>
+    <SignAssembly>true</SignAssembly>
-    <DebugType>full</DebugType>
+    <DelaySign>false</DelaySign>
-    <Optimize>false</Optimize>
+    <AssemblyOriginatorKeyFile>nsspi key.snk</AssemblyOriginatorKeyFile>
-    <OutputPath>bin\Debug\</OutputPath>
+    <PackageLicenseFile>License.txt</PackageLicenseFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\NSspi.XML</DocumentationFile>
   </PropertyGroup>
+  
   <PropertyGroup>
-    <StartupObject>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    </StartupObject>
   </PropertyGroup>
-  <ItemGroup>
+
-    <Reference Include="System" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <Reference Include="System.Core" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.DirectoryServices.AccountManagement" />
-    <Reference Include="System.Data" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="ByteWriter.cs" />
+    <None Include="..\License.txt">
-    <Compile Include="Contexts\ClientContext.cs" />
+      <Pack>True</Pack>
-    <Compile Include="Contexts\Context.cs" />
+      <PackagePath></PackagePath>
-    <Compile Include="Contexts\ContextAttrib.cs" />
+    </None>
-    <Compile Include="Contexts\ContextNativeMethods.cs" />
-    <Compile Include="Contexts\ContextQueries.cs" />
-    <Compile Include="Contexts\ContextQueryAttrib.cs" />
-    <Compile Include="Contexts\ImpersonationHandle.cs" />
-    <Compile Include="Contexts\SafeContextHandle.cs" />
-    <Compile Include="Credentials\CurrentCredential.cs" />
-    <Compile Include="EnumMgr.cs" />
-    <Compile Include="SecPkgInfo.cs" />
-    <Compile Include="Contexts\ServerContext.cs" />
-    <Compile Include="Credentials\ClientCredential.cs" />
-    <Compile Include="Credentials\Credential.cs" />
-    <Compile Include="Credentials\CredentialNativeMethods.cs" />
-    <Compile Include="Credentials\CredentialQueryAttrib.cs" />
-    <Compile Include="Credentials\CredentialUse.cs" />
-    <Compile Include="Credentials\QueryNameSupport.cs" />
-    <Compile Include="Credentials\SafeCredentialHandle.cs" />
-    <Compile Include="Credentials\ServerCredential.cs" />
-    <Compile Include="NativeMethods.cs" />
-    <Compile Include="PackageSupport.cs" />
-    <Compile Include="PackageNames.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SecureBuffer\SecureBuffer.cs" />
-    <Compile Include="SecureBuffer\SecureBufferAdapter.cs" />
-    <Compile Include="SecureBuffer\SecureBufferDataRep.cs" />
-    <Compile Include="SecureBuffer\SecureBufferDesc.cs" />
-    <Compile Include="SecureBuffer\SecureBufferType.cs" />
-    <Compile Include="SecurityStatus.cs" />
-    <Compile Include="SSPIException.cs" />
-    <Compile Include="SspiHandle.cs" />
-    <Compile Include="TimeStamp.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NSspi.nuspec" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

NSspi/NSspi.nuspec

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package >
-    <metadata>
-        <id>NSspi</id>
-        <version>0.1.3.0</version>
-        <authors>Kevin Thompson</authors>
-        <owners>Kevin Thompson</owners>
-        <projectUrl>https://github.com/antiduh/nsspi</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>
-            A C#/.Net interface to the Win32 SSPI authentication API,
-            better known as Windows Integrated Authentication.
-        </description>
-        <language>C#</language>
-        <releaseNotes>First release of NSspi.</releaseNotes>
-        <copyright>Copyright 2017</copyright>
-    </metadata>
-</package>

NSspi/NativeMethods.cs

@@ -1,21 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using NSspi.Contexts;
 
 namespace NSspi
 {
     internal static class NativeMethods
     {
-        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "FreeContextBuffer", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus FreeContextBuffer( IntPtr buffer );
 
-
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "QuerySecurityPackageInfo", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus QuerySecurityPackageInfo( string packageName, ref IntPtr pkgInfo );
@@ -24,5 +18,8 @@ namespace NSspi
         [DllImport( "Secur32.dll", EntryPoint = "EnumerateSecurityPackages", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus EnumerateSecurityPackages( ref int numPackages, ref IntPtr pkgInfoArry );
 
+        [DllImport( "Kernel32.dll", EntryPoint = "CloseHandle", SetLastError = true )]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
+        internal static extern bool CloseHandle( IntPtr handle );
     }
 }

NSspi/PackageNames.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {

NSspi/PackageSupport.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {
@@ -35,11 +31,11 @@ namespace NSspi
             {
                 status = NativeMethods.QuerySecurityPackageInfo( packageName, ref rawInfoPtr );
 
-                if ( rawInfoPtr != IntPtr.Zero )
+                if( rawInfoPtr != IntPtr.Zero )
                 {
                     try
                     {
-                        if ( status == SecurityStatus.OK )
+                        if( status == SecurityStatus.OK )
                         {
                             // This performs allocations as it makes room for the strings contained in the SecPkgInfo class.
                             Marshal.PtrToStructure( rawInfoPtr, info );
@@ -71,7 +67,7 @@ namespace NSspi
             IntPtr pkgArrayPtr;
             IntPtr pkgPtr;
             int numPackages = 0;
-            int pkgSize = Marshal.SizeOf( typeof(SecPkgInfo) );
+            int pkgSize = Marshal.SizeOf( typeof( SecPkgInfo ) );
 
             pkgArrayPtr = new IntPtr();
 

NSspi/Properties/AssemblyInfo.cs

@@ -1,36 +1,9 @@
-using System.Reflection;
+using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("NSspi")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Kevin Thompson")]
-[assembly: AssemblyProduct("NSspi")]
-[assembly: AssemblyCopyright("Copyright © Kevin Thompson 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9abf710c-c646-42aa-8183-76bfa141a07b")]
+[assembly: Guid( "9abf710c-c646-42aa-8183-76bfa141a07b" )]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.3.0")]
-[assembly: AssemblyFileVersion("0.1.2.0")]

NSspi/SSPIException.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {
@@ -35,7 +31,7 @@ namespace NSspi
         protected SSPIException( SerializationInfo info, StreamingContext context )
             : base( info, context )
         {
-            this.message = info.GetString("message");
+            this.message = info.GetString( "message" );
             this.errorCode = (SecurityStatus)info.GetUInt32( "errorCode" );
         }
 
@@ -74,7 +70,7 @@ namespace NSspi
                     "{0}. Error Code = '0x{1:X}' - \"{2}\".",
                     this.message,
                     this.errorCode,
-                    EnumMgr.ToText(this.errorCode) 
+                    EnumMgr.ToText( this.errorCode )
                 );
             }
         }

NSspi/SecPkgInfo.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {

NSspi/SecureBuffer/SecureBuffer.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Buffers
 {

NSspi/SecureBuffer/SecureBufferAdapter.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Buffers
 {
@@ -120,7 +117,7 @@ namespace NSspi.Buffers
             this.bufferHandles = new GCHandle[this.buffers.Count];
             this.bufferCarrier = new SecureBufferInternal[this.buffers.Count];
 
-            for ( int i = 0; i < this.buffers.Count; i++ )
+            for( int i = 0; i < this.buffers.Count; i++ )
             {
                 this.bufferHandles[i] = GCHandle.Alloc( this.buffers[i].Buffer, GCHandleType.Pinned );
 
@@ -156,7 +153,7 @@ namespace NSspi.Buffers
         {
             get
             {
-                if ( this.disposed )
+                if( this.disposed )
                 {
                     throw new ObjectDisposedException( "Cannot use SecureBufferListHandle after it has been disposed" );
                 }
@@ -184,9 +181,9 @@ namespace NSspi.Buffers
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         private void Dispose( bool disposing )
         {
-            if ( this.disposed == true ) { return; }
+            if( this.disposed == true ) { return; }
 
-            if ( disposing )
+            if( disposing )
             {
                 // When this class is actually being used for its original purpose - to convey buffers
                 // back and forth to SSPI calls - we need to copy the potentially modified structure members

NSspi/SecureBuffer/SecureBufferDataRep.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Buffers
 {

NSspi/SecureBuffer/SecureBufferDesc.cs

@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Buffers
 {
@@ -12,7 +7,7 @@ namespace NSspi.Buffers
     /// Represents the native layout of the secure buffer descriptor that is provided directly
     /// to native API calls.
     /// </summary>
-    [StructLayout( LayoutKind.Sequential)]
+    [StructLayout( LayoutKind.Sequential )]
     internal struct SecureBufferDescInternal
     {
         /// <summary>

NSspi/SecureBuffer/SecureBufferType.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi.Buffers
 {
@@ -57,7 +53,7 @@ namespace NSspi.Buffers
         Stream = 0x0A,
         ChannelBindings = 0x0E,
         TargetHost = 0x10,
-        ReadOnlyFlag = unchecked( (int)0x80000000 ),
+        ReadOnlyFlag = unchecked((int)0x80000000),
         ReadOnlyWithChecksum = 0x10000000
     }
 }

NSspi/SecurityStatus.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {
@@ -60,70 +56,128 @@ namespace NSspi
         [EnumString( "The security context was used after its expiration time passed." )]
         ContextExpired = 0x00090317,
 
+        /// <summary>
+        /// The credentials supplied to the security context were not fully initialized.
+        /// </summary>
         [EnumString( "The credentials supplied to the security context were not fully initialized." )]
         CredentialsNeeded = 0x00090320,
 
-        [EnumString( "The context data must be re-negotiated with the peer" )]
+        /// <summary>
+        /// The context data must be re-negotiated with the peer.
+        /// </summary>
+        [EnumString( "The context data must be re-negotiated with the peer." )]
         Renegotiate = 0x00090321,
 
-        // Errors
+        // -------------- Errors --------------
-        [EnumString( "Not enough memory.")]
+
+        /// <summary>
+        /// The SSPI operation failed due to insufficient memory resources.
+        /// </summary>
+        [EnumString( "Not enough memory." )]
         OutOfMemory = 0x80090300,
 
-        [EnumString( "The handle provided to the API was invalid.")]
+        /// <summary>
+        /// The handle provided to the API was invalid.
+        /// </summary>
+        [EnumString( "The handle provided to the API was invalid." )]
         InvalidHandle = 0x80090301,
 
-        [EnumString( "The attempted operation is not supported")]
+        /// <summary>
+        /// The attempted operation is not supported.
+        /// </summary>
+        [EnumString( "The attempted operation is not supported." )]
         Unsupported = 0x80090302,
 
-        [EnumString( "The specified principle is not known in the authentication system.")]
+        /// <summary>
+        /// The specified principle is not known in the authentication system.
+        /// </summary>
+        [EnumString( "The specified principle is not known in the authentication system." )]
         TargetUnknown = 0x80090303,
 
-        [EnumString( "An internal error occurred" )]
+        /// <summary>
+        /// An internal error occurred
+        /// </summary>
+        [EnumString( "An internal error occurred." )]
         InternalError = 0x80090304,
 
         /// <summary>
         /// No security provider package was found with the given name.
         /// </summary>
-        [EnumString( "The requested security package was not found.")]
+        [EnumString( "The requested security package was not found." )]
         PackageNotFound = 0x80090305,
 
+        /// <summary>
+        /// Cannot use the provided credentials, the caller is not the owner of the credentials.
+        /// </summary>
+        [EnumString( "The caller is not the owner of the desired credentials." )]
         NotOwner = 0x80090306,
+
+        /// <summary>
+        /// The requested security package failed to initalize, and thus cannot be used.
+        /// </summary>
+        [EnumString( "The requested security package failed to initalize, and thus cannot be used." )]
         CannotInstall = 0x80090307,
 
         /// <summary>
         /// A token was provided that contained incorrect or corrupted data.
         /// </summary>
-        [EnumString("The provided authentication token is invalid or corrupted.")]
+        [EnumString( "The provided authentication token is invalid or corrupted." )]
         InvalidToken = 0x80090308,
 
+        /// <summary>
+        /// The security package is not able to marshall the logon buffer, so the logon attempt has failed
+        /// </summary>
+        [EnumString( "The security package is not able to marshall the logon buffer, so the logon attempt has failed." )]
         CannotPack = 0x80090309,
+
+        /// <summary>
+        /// The per-message Quality of Protection is not supported by the security package.
+        /// </summary>
+        [EnumString( "The per-message Quality of Protection is not supported by the security package." )]
         QopNotSupported = 0x8009030A,
 
         /// <summary>
         /// Impersonation is not supported.
         /// </summary>
-        [EnumString("Impersonation is not supported with the current security package.")]
+        [EnumString( "Impersonation is not supported with the current security package." )]
         NoImpersonation = 0x8009030B,
 
-        [EnumString("The logon was denied, perhaps because the provided credentials were incorrect.")]
+        /// <summary>
+        /// The logon was denied, perhaps because the provided credentials were incorrect.
+        /// </summary>
+        [EnumString( "The logon was denied, perhaps because the provided credentials were incorrect." )]
         LogonDenied = 0x8009030C,
 
-
+        /// <summary>
-        [EnumString( "The credentials provided are not recognized by the selected security package.")]
+        /// The credentials provided are not recognized by the selected security package.
+        /// </summary>
+        [EnumString( "The credentials provided are not recognized by the selected security package." )]
         UnknownCredentials = 0x8009030D,
 
-        [EnumString( "No credentials are available in the selected security package.")]
+        /// <summary>
+        /// No credentials are available in the selected security package.
+        /// </summary>
+        [EnumString( "No credentials are available in the selected security package." )]
         NoCredentials = 0x8009030E,
 
+        /// <summary>
+        /// A message that was provided to the Decrypt or VerifySignature functions was altered after
+        /// it was created.
+        /// </summary>
         [EnumString( "A message that was provided to the Decrypt or VerifySignature functions was altered " +
-        "after it was created.")]
+            "after it was created." )]
         MessageAltered = 0x8009030F,
 
-        [EnumString( "A message was received out of the expected order.")]
+        /// <summary>
+        /// A message was received out of the expected order.
+        /// </summary>
+        [EnumString( "A message was received out of the expected order." )]
         OutOfSequence = 0x80090310,
 
-        [EnumString( "The current security package cannot contact an authenticating authority.")]
+        /// <summary>
+        /// The current security package cannot contact an authenticating authority.
+        /// </summary>
+        [EnumString( "The current security package cannot contact an authenticating authority." )]
         NoAuthenticatingAuthority = 0x80090311,
 
         /// <summary>
@@ -137,19 +191,87 @@ namespace NSspi
         /// will indicate success, but will save off the extra, unrelated data in a buffer of
         /// type 'extra'.
         /// </remarks>
+        [EnumString( "The buffer provided to an SSPI API call contained a message that was not complete." )]
         IncompleteMessage = 0x80090318,
+
+        /// <summary>
+        /// The credentials supplied were not complete, and could not be verified. The context could not be initialized.
+        /// </summary>
+        [EnumString( "The credentials supplied were not complete, and could not be verified. The context could not be initialized." )]
         IncompleteCredentials = 0x80090320,
+
+        /// <summary>
+        /// The buffers supplied to a security function were too small.
+        /// </summary>
+        [EnumString( "The buffers supplied to a security function were too small." )]
         BufferNotEnough = 0x80090321,
+
+        /// <summary>
+        /// The target principal name is incorrect.
+        /// </summary>
+        [EnumString( "The target principal name is incorrect." )]
         WrongPrincipal = 0x80090322,
+
+        /// <summary>
+        /// The clocks on the client and server machines are skewed.
+        /// </summary>
+        [EnumString( "The clocks on the client and server machines are skewed." )]
         TimeSkew = 0x80090324,
+
+        /// <summary>
+        /// The certificate chain was issued by an authority that is not trusted.
+        /// </summary>
+        [EnumString( "The certificate chain was issued by an authority that is not trusted." )]
         UntrustedRoot = 0x80090325,
+
+        /// <summary>
+        /// The message received was unexpected or badly formatted.
+        /// </summary>
+        [EnumString( "The message received was unexpected or badly formatted." )]
         IllegalMessage = 0x80090326,
+
+        /// <summary>
+        /// An unknown error occurred while processing the certificate.
+        /// </summary>
+        [EnumString( "An unknown error occurred while processing the certificate." )]
         CertUnknown = 0x80090327,
+
+        /// <summary>
+        /// The received certificate has expired.
+        /// </summary>
+        [EnumString( "The received certificate has expired." )]
         CertExpired = 0x80090328,
+
+        /// <summary>
+        /// The client and server cannot communicate, because they do not possess a common algorithm.
+        /// </summary>
+        [EnumString( "The client and server cannot communicate, because they do not possess a common algorithm." )]
         AlgorithmMismatch = 0x80090331,
+
+        /// <summary>
+        /// The security context could not be established due to a failure in the requested quality
+        /// of service (e.g. mutual authentication or delegation).
+        /// </summary>
+        [EnumString( "The security context could not be established due to a failure in the requested " + 
+            "quality of service (e.g. mutual authentication or delegation)." )]
         SecurityQosFailed = 0x80090332,
+
+        /// <summary>
+        /// Smartcard logon is required and was not used.
+        /// </summary>
+        [EnumString( "Smartcard logon is required and was not used." )]
         SmartcardLogonRequired = 0x8009033E,
+
+        /// <summary>
+        /// An unsupported preauthentication mechanism was presented to the Kerberos package.
+        /// </summary>
+        [EnumString( "An unsupported preauthentication mechanism was presented to the Kerberos package." )]
         UnsupportedPreauth = 0x80090343,
+
+        /// <summary>
+        /// Client's supplied SSPI channel bindings were incorrect.
+        /// </summary>
+        [EnumString( "Client's supplied SSPI channel bindings were incorrect." )]
         BadBinding = 0x80090346
     }
 
@@ -168,5 +290,4 @@ namespace NSspi
             return (uint)status > 0x80000000u;
         }
     }
-
 }

NSspi/SspiHandle.cs

@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using NSspi.Contexts;
 
 namespace NSspi
 {
@@ -25,7 +19,7 @@ namespace NSspi
     /// to this handle for performing work (InitializeSecurityContext, eg) should be performed a CER
     /// that employs handle reference counting across the native API invocation.
     /// </remarks>
-    [StructLayout( LayoutKind.Sequential, Pack = 1 ) ]
+    [StructLayout( LayoutKind.Sequential, Pack = 1 )]
     internal struct RawSspiHandle
     {
         private IntPtr lowPart;
@@ -46,7 +40,7 @@ namespace NSspi
         /// <remarks>
         /// This method is executed in a CER during handle release.
         /// </remarks>
-        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success)]
+        [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         public void SetInvalid()
         {
             this.lowPart = IntPtr.Zero;
@@ -61,17 +55,27 @@ namespace NSspi
     {
         internal RawSspiHandle rawHandle;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SafeSspiHandle"/> class.
+        /// </summary>
         protected SafeSspiHandle()
             : base( IntPtr.Zero, true )
         {
             this.rawHandle = new RawSspiHandle();
         }
 
+        /// <summary>
+        /// Gets whether the handle is invalid.
+        /// </summary>
         public override bool IsInvalid
         {
             get { return IsClosed || this.rawHandle.IsZero(); }
         }
 
+        /// <summary>
+        /// Marks the handle as no longer being in use.
+        /// </summary>
+        /// <returns></returns>
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         protected override bool ReleaseHandle()
         {

NSspi/TimeStamp.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NSspi
 {
@@ -14,6 +10,9 @@ namespace NSspi
     [StructLayout( LayoutKind.Sequential )]
     public struct TimeStamp
     {
+        /// <summary>
+        /// Returns the calendar date and time corresponding a zero timestamp.
+        /// </summary>
         public static readonly DateTime Epoch = new DateTime( 1601, 1, 1, 0, 0, 0, DateTimeKind.Utc );
 
         /// <summary>
@@ -29,13 +28,13 @@ namespace NSspi
         /// <returns></returns>
         public DateTime ToDateTime()
         {
-            ulong test = (ulong)this.time + (ulong)(Epoch.Ticks);
+            ulong test = (ulong)this.time + (ulong)( Epoch.Ticks );
 
             // Sometimes the value returned is massive, eg, 0x7fffff154e84ffff, which is a value
             // somewhere in the year 30848. This would overflow DateTime, since it peaks at 31-Dec-9999.
             // It turns out that this value corresponds to a TimeStamp's maximum value, reduced by my local timezone
             // http://stackoverflow.com/questions/24478056/
-            if ( test > (ulong)DateTime.MaxValue.Ticks )
+            if( test > (ulong)DateTime.MaxValue.Ticks )
             {
                 return DateTime.MaxValue;
             }

NsspiDemo/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>

NsspiDemo/NsspiDemo.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NsspiDemo</RootNamespace>
     <AssemblyName>NsspiDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

NsspiDemo/Program.cs

@@ -16,10 +16,10 @@ namespace NSspi
 
         private static void CredTest( string packageName )
         {
-            ClientCredential clientCred = null;
+            ClientCurrentCredential clientCred = null;
             ClientContext client = null;
 
-            ServerCredential serverCred = null;
+            ServerCurrentCredential serverCred = null;
             ServerContext server = null;
 
             byte[] clientToken;
@@ -30,8 +30,8 @@ namespace NSspi
 
             try
             {
-                clientCred = new ClientCredential( packageName );
+                clientCred = new ClientCurrentCredential( packageName );
-                serverCred = new ServerCredential( packageName );
+                serverCred = new ServerCurrentCredential( packageName );
 
                 Console.Out.WriteLine( clientCred.PrincipleName );
 
@@ -47,7 +47,6 @@ namespace NSspi
                     ContextAttrib.Delegate
                 );
 
-
                 server = new ServerContext(
                     serverCred,
                     ContextAttrib.MutualAuth |
@@ -64,18 +63,17 @@ namespace NSspi
 
                 clientStatus = client.Init( serverToken, out clientToken );
 
-                while ( true )
+                while( true )
                 {
                     serverStatus = server.AcceptToken( clientToken, out serverToken );
 
-                    if ( serverStatus != SecurityStatus.ContinueNeeded && clientStatus != SecurityStatus.ContinueNeeded ) { break; }
+                    if( serverStatus != SecurityStatus.ContinueNeeded && clientStatus != SecurityStatus.ContinueNeeded ) { break; }
 
                     clientStatus = client.Init( serverToken, out clientToken );
 
-                    if ( serverStatus != SecurityStatus.ContinueNeeded && clientStatus != SecurityStatus.ContinueNeeded ) { break; }
+                    if( serverStatus != SecurityStatus.ContinueNeeded && clientStatus != SecurityStatus.ContinueNeeded ) { break; }
                 }
 
-
                 Console.Out.WriteLine( "Server authority: " + server.AuthorityName );
                 Console.Out.WriteLine( "Server context user: " + server.ContextUserName );
 
@@ -102,7 +100,7 @@ namespace NSspi
                     throw new Exception();
                 }
 
-                for( int i= 0; i < plainText.Length; i++ )
+                for( int i = 0; i < plainText.Length; i++ )
                 {
                     if( plainText[i] != roundTripPlaintext[i] )
                     {
@@ -117,25 +115,23 @@ namespace NSspi
                     throw new Exception();
                 }
 
-
                 using( server.ImpersonateClient() )
                 {
-
                 }
 
                 cipherText = client.MakeSignature( plainText );
 
                 bool goodSig = server.VerifySignature( cipherText, out roundTripPlaintext );
 
-                if ( goodSig == false ||
+                if( goodSig == false ||
                      roundTripPlaintext.Length != plainText.Length )
                 {
                     throw new Exception();
                 }
 
-                for ( int i = 0; i < plainText.Length; i++ )
+                for( int i = 0; i < plainText.Length; i++ )
                 {
-                    if ( plainText[i] != roundTripPlaintext[i] )
+                    if( plainText[i] != roundTripPlaintext[i] )
                     {
                         throw new Exception();
                     }
@@ -145,12 +141,12 @@ namespace NSspi
             }
             finally
             {
-                if ( server != null )
+                if( server != null )
                 {
                     server.Dispose();
                 }
 
-                if ( client != null )
+                if( client != null )
                 {
                     client.Dispose();
                 }
@@ -160,7 +156,7 @@ namespace NSspi
                     clientCred.Dispose();
                 }
 
-                if ( serverCred != null )
+                if( serverCred != null )
                 {
                     serverCred.Dispose();
                 }

NsspiDemo/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

NsspiDemo/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace NsspiDemo.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

NsspiDemo/Properties/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace NsspiDemo.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

TestClient/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>

TestClient/ClientForm.cs

@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using NSspi;
 using NSspi.Contexts;
@@ -20,7 +14,7 @@ namespace TestClient
     public partial class ClientForm : Form
     {
         private ClientContext context;
-        private ClientCredential cred;
+        private ClientCurrentCredential cred;
 
         private CustomConnection connection;
 
@@ -48,7 +42,7 @@ namespace TestClient
             this.FormClosing += Form1_FormClosing;
 
             // --- SSPI ---
-            this.cred = new ClientCredential( PackageNames.Negotiate );
+            this.cred = new ClientCurrentCredential( PackageNames.Negotiate );
 
             this.context = new ClientContext(
                 cred,
@@ -107,7 +101,6 @@ namespace TestClient
                         throw;
                     }
                 }
-
             }
         }
 
@@ -116,7 +109,6 @@ namespace TestClient
             this.connection.Stop();
         }
 
-
         private void encryptButton_Click( object sender, EventArgs e )
         {
             byte[] plaintext;
@@ -149,7 +141,7 @@ namespace TestClient
 
         private void connection_Received( Message message )
         {
-            this.Invoke( (Action)delegate()
+            this.Invoke( (Action)delegate ()
             {
                 if( message.Operation == ProtocolOp.ServerToken )
                 {
@@ -180,7 +172,7 @@ namespace TestClient
             this.initializing = false;
             this.lastServerToken = null;
 
-            this.BeginInvoke( (Action)delegate()
+            this.BeginInvoke( (Action)delegate ()
             {
                 this.context.Dispose();
                 this.context = new ClientContext(
@@ -195,7 +187,7 @@ namespace TestClient
                 );
 
                 UpdateButtons();
-            });
+            } );
         }
 
         private void DoInit()

TestClient/Program.cs

@@ -1,18 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace TestClient
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault( false );

TestClient/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

TestClient/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace TestClient.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

TestClient/Properties/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace TestClient.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

TestClient/TestClient.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestClient</RootNamespace>
     <AssemblyName>TestClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

TestProtocol/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>

TestProtocol/CustomConnection.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using NSspi;
 
@@ -33,7 +29,7 @@ namespace TestProtocol
         {
             if( this.running )
             {
-                throw new InvalidOperationException("Already running");
+                throw new InvalidOperationException( "Already running" );
             }
 
             this.socket = new Socket( AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp );
@@ -65,7 +61,7 @@ namespace TestProtocol
                 throw new InvalidOperationException( "Not connected" );
             }
 
-            byte[] outBuffer = new byte[ message.Data.Length + 8 ];
+            byte[] outBuffer = new byte[message.Data.Length + 8];
             int position = 0;
 
             ByteWriter.WriteInt32_BE( (int)message.Operation, outBuffer, position );
@@ -97,10 +93,7 @@ namespace TestProtocol
 
                 try
                 {
-                    if( this.Disconnected != null )
+                    this.Disconnected?.Invoke();
-                    {
-                        this.Disconnected();
-                    }
                 }
                 catch
                 { }
@@ -124,7 +117,6 @@ namespace TestProtocol
                     //                          |--4 bytes--|--4 bytes--|---N--|
                     // Every command is a TLV - | Operation |  Length   | Data |
 
-
                     // Read the operation.
                     this.socket.Receive( readBuffer, 4, SocketFlags.None );
 
@@ -153,7 +145,6 @@ namespace TestProtocol
                         remaining -= chunkLength;
                         position += chunkLength;
                     }
-
                 }
                 catch( SocketException e )
                 {
@@ -184,10 +175,9 @@ namespace TestProtocol
                     {
                         this.Received( message );
                     }
-                    catch( Exception e )
+                    catch( Exception )
                     { }
                 }
-                
             }
         }
     }

TestProtocol/CustomServer.cs

@@ -212,7 +212,6 @@ namespace TestProtocol
                     catch( Exception )
                     { }
                 }
-
             }
 
             try
@@ -225,5 +224,4 @@ namespace TestProtocol
             catch { }
         }
     }
-
 }

TestProtocol/Message.cs

@@ -1,14 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TestProtocol
 {
     public class Message
     {
-        public Message(ProtocolOp op, byte[] data)
+        public Message( ProtocolOp op, byte[] data )
         {
             this.Operation = op;
             this.Data = data;

TestProtocol/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

TestProtocol/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace TestProtocol.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

TestProtocol/Properties/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace TestProtocol.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

TestProtocol/ProtocolOp.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TestProtocol
 {

TestProtocol/TestProtocol.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestProtocol</RootNamespace>
     <AssemblyName>TestProtocol</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

TestServer/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
 </configuration>

TestServer/Program.cs

@@ -1,18 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace TestServer
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault( false );

TestServer/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

TestServer/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace TestServer.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

TestServer/Properties/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace TestServer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

TestServer/ServerForm.Designer.cs

@@ -170,7 +170,8 @@
             // 
             // impersonateButton
             // 
-            this.impersonateButton.Location = new System.Drawing.Point(262, 350);
+            this.impersonateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.impersonateButton.Location = new System.Drawing.Point(262, 356);
             this.impersonateButton.Name = "impersonateButton";
             this.impersonateButton.Size = new System.Drawing.Size(116, 23);
             this.impersonateButton.TabIndex = 4;

TestServer/ServerForm.cs

@@ -1,25 +1,21 @@
 using System;
-using System.Collections.Generic;
+using System.IO;
-using System.ComponentModel;
+using System.Security.Principal;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
+using NSspi;
+using NSspi.Contexts;
+using NSspi.Credentials;
 using TestProtocol;
 
 namespace TestServer
 {
-    using System.IO;
+
-    using NSspi;
-    using NSspi.Contexts;
-    using NSspi.Credentials;
     using Message = TestProtocol.Message;
 
     public partial class ServerForm : Form
     {
-        private ServerCredential serverCred;
+        private ServerCurrentCredential serverCred;
 
         private ServerContext serverContext;
 
@@ -35,7 +31,7 @@ namespace TestServer
         {
             InitializeComponent();
 
-            this.serverCred = new ServerCredential( PackageNames.Negotiate );
+            this.serverCred = new ServerCurrentCredential( PackageNames.Negotiate );
 
             this.serverContext = new ServerContext(
                 serverCred,
@@ -44,7 +40,8 @@ namespace TestServer
                 ContextAttrib.SequenceDetect |
                 ContextAttrib.MutualAuth |
                 ContextAttrib.Delegate |
-                ContextAttrib.Confidentiality
+                ContextAttrib.Confidentiality,
+                true
             );
 
             this.server = new CustomServer();
@@ -129,7 +126,11 @@ namespace TestServer
             {
                 MessageBox.Show( "Starting impersonation: " + Environment.UserName );
 
-                FileStream stream = File.Create( Environment.GetFolderPath( Environment.SpecialFolder.DesktopDirectory) + @"\test.txt" );
+                var directory = Environment.GetFolderPath( Environment.SpecialFolder.DesktopDirectory );
+
+                Directory.CreateDirectory( directory );
+
+                FileStream stream = File.Create( directory + @"\test.txt" );
                 StreamWriter writer = new StreamWriter( stream, Encoding.UTF8 );
 
                 writer.WriteLine( "Hello world." );
@@ -150,7 +151,6 @@ namespace TestServer
             this.signButton.Enabled = this.connected;
         }
 
-
         private void server_Received( Message message )
         {
             if( message.Operation == ProtocolOp.ClientToken )
@@ -171,13 +171,38 @@ namespace TestServer
             }
         }
 
+        private void InitComplete()
+        {
+            UpdateButtons();
+            this.clientUsernameTextBox.Text = serverContext.ContextUserName;
+
+            var builder = new StringBuilder();
+            var remoteId = this.serverContext.GetRemoteIdentity();
+
+            builder.AppendLine( "Client identity information:" );
+            builder.AppendLine( " - Name: " + remoteId.Name );
+
+            var windowsId = remoteId as WindowsIdentity;
+
+            if( windowsId != null )
+            {
+                builder.AppendLine( " - User SID: " + windowsId.User.Value );
+
+                foreach( var claim in windowsId.Claims )
+                {
+                    builder.AppendLine( " - " + claim.ToString() );
+                }
+            }
+
+            this.receivedTextbox.AppendText( builder.ToString() );
+        }
+
         private void server_Disconnected()
         {
             this.running = true;
             this.initializing = true;
             this.connected = false;
 
-
             this.serverContext.Dispose();
             this.serverContext = new ServerContext(
                 serverCred,
@@ -189,14 +214,13 @@ namespace TestServer
                 ContextAttrib.Confidentiality
             );
 
-            this.BeginInvoke( (Action)delegate() 
+            this.BeginInvoke( (Action)delegate ()
             {
                 UpdateButtons();
                 this.clientUsernameTextBox.Text = "";
-            });
+            } );
         }
 
-
         private void HandleInit( Message message )
         {
             byte[] nextToken;
@@ -218,27 +242,22 @@ namespace TestServer
                         this.initializing = false;
                         this.connected = true;
 
-                        this.Invoke( (Action)delegate() 
+                        this.Invoke( (Action)InitComplete );
-                        { 
-                            UpdateButtons();
-                            this.clientUsernameTextBox.Text = serverContext.ContextUserName;
-                        } );
                     }
                 }
                 else
                 {
-                    this.Invoke( (Action)delegate() 
+                    this.Invoke( (Action)delegate ()
                     {
                         MessageBox.Show( "Failed to accept token from client. Sspi error code: " + status );
                     } );
                 }
-
             }
         }
 
         private void HandleEncrypted( Message message )
         {
-            this.Invoke( (Action)delegate()
+            this.Invoke( (Action)delegate ()
             {
                 byte[] plainText = this.serverContext.Decrypt( message.Data );
                 string text = Encoding.UTF8.GetString( plainText );
@@ -249,7 +268,7 @@ namespace TestServer
 
         private void HandleSigned( Message message )
         {
-            this.Invoke( (Action)delegate()
+            this.Invoke( (Action)delegate ()
             {
                 byte[] plainText;
 
@@ -268,11 +287,10 @@ namespace TestServer
 
         private void HandleUnknown( Message message )
         {
-            this.Invoke( (Action)delegate()
+            this.Invoke( (Action)delegate ()
             {
                 MessageBox.Show( "Received unexpected message from server. Message type: " + message.Operation );
             } );
         }
-
     }
 }

TestServer/TestServer.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestServer</RootNamespace>
     <AssemblyName>TestServer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

readme.md

@@ -1,9 +1,10 @@
 ## Downloads ##
 
-The latest release of NSspi is v0.1.1.
+The latest release of NSspi is v0.3.1, released 5-Aug-2019. 
 
-* [Source](https://github.com/antiduh/nsspi/archive/0.1.1.zip)
+Version 0.3.1 adds support to obtain an IIdentity/WindowsPrinciple representing the remote connection. This is useful for servers that wish to query the properties on the principle, such as claims.
-* [Binaries](https://github.com/antiduh/nsspi/releases/download/0.1.1/nsspi-0.1.1-bin.zip)
+
+* [Source](https://github.com/antiduh/nsspi/archive/0.3.1.zip)
 * [Nuget package](https://www.nuget.org/packages/NSspi)
 
 You can also browse the list of [releases](https://github.com/antiduh/nsspi/releases).
@@ -11,7 +12,7 @@ You can also browse the list of [releases](https://github.com/antiduh/nsspi/rele
 
 
 ## Introduction ##
-This projects provides a C# / .Net interface to the Windows Integrated Authentication API, better known as SSPI (Security Service Provider Interface). This allows a custom client / server system to authenticate users using their existing logon credentials. This allows a developer to provide Single-Sign-On in their application.
+This project provides a C# / .Net interface to the Windows Integrated Authentication API, better known as SSPI (Security Service Provider Interface). This allows a custom client / server system to authenticate users using their existing logon credentials. This allows a developer to provide Single-Sign-On in their application.
 
 ## Overview ##
 The API provides raw access to authentication tokens so that authentication can be easily integrated into any networking system - you can send the tokens over a socket, a remoting interface, or heck even a serial port if you want; they're just bytes. Clients and servers may exchange encrypted and signed messages, and the server can perform client impersonation.