Updated copyright year.

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 14
+VisualStudioVersion = 14.0.25420.1
+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
 {
@@ -38,7 +33,6 @@ namespace NSspi
             buffer[position + 1] = (byte)( value >> 16 );
             buffer[position + 2] = (byte)( value >> 8 );
             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;

NSspi/Contexts/Context.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using NSspi.Buffers;
-using NSspi.Contexts;
 using NSspi.Credentials;
 
 namespace NSspi.Contexts
@@ -296,7 +291,6 @@ namespace NSspi.Contexts
             }
             // else there was no padding.
 
-
             using( adapter = new SecureBufferAdapter( new[] { trailerBuffer, dataBuffer, paddingBuffer } ) )
             {
                 status = ContextNativeMethods.SafeDecryptMessage(
@@ -389,6 +383,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>

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
 {
@@ -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,
@@ -110,7 +102,6 @@ namespace NSspi.Contexts
         [DllImport( "Secur32.dll", EntryPoint = "DeleteSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus DeleteSecurityContext( ref RawSspiHandle contextHandle );
 
-
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.MayFail )]
         [DllImport( "Secur32.dll", EntryPoint = "EncryptMessage", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus EncryptMessage(
@@ -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,72 @@ namespace NSspi.Contexts
         [DllImport( "Secur32.dll", EntryPoint = "RevertSecurityContext", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus RevertSecurityContext( ref RawSspiHandle contextHandle );
 
+        [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.

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.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Principal;
+using System.Threading;
 
 namespace NSspi.Contexts
 {
@@ -20,8 +18,9 @@ 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.
@@ -33,13 +32,16 @@ namespace NSspi.Contexts
             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.server.RevertImpersonate();
-            }
-        }
+            // 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.
 
+            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/ServerContext.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Principal;
+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 ContextAttrib finalAttribs;
+        private readonly ContextAttrib requestedAttribs;
+        private readonly bool impersonationSetsThreadPrinciple;
 
+        private ContextAttrib finalAttribs;
         private bool impersonating;
 
         /// <summary>
-        /// Performs basic initialization of a new instance of the ServerContext class. The ServerContext
-        /// is not ready for message manipulation until a security context has been established with a client.
+        /// Performs basic initialization of a new instance of the ServerContext class. The
+        /// 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;
@@ -125,16 +130,12 @@ namespace NSspi.Contexts
                             ref this.finalAttribs,
                             ref rawExpiry
                         );
-
-
                     }
                 }
             }
 
             if( status == SecurityStatus.OK )
             {
-                nextToken = null;
-
                 base.Initialize( rawExpiry.ToDateTime() );
 
                 if( outBuffer.Length != 0 )
@@ -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 )
+            {
+                SetThreadPrinciple();
+            }
+
             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
@@ -305,5 +315,15 @@ namespace NSspi.Contexts
 
             base.Dispose( disposing );
         }
+
+        /// <summary>
+        /// Set the current thread security context to the impersonated identity.
+        /// </summary>
+        private void SetThreadPrinciple()
+        {
+            Thread.CurrentPrincipal = new WindowsPrincipal(
+                WindowsIdentity.GetCurrent( TokenAccessLevels.AllAccess ) 
+            );
+        }
     }
 }

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,6 +177,10 @@ 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 )

NSspi/Credentials/CredentialNativeMethods.cs

@@ -1,11 +1,6 @@
 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
 {
@@ -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
 {
@@ -64,6 +60,5 @@ namespace NSspi.Credentials
 
             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,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4B4CD933-BF62-4F92-B8FA-6771758C5197}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
     <RootNamespace>NSspi</RootNamespace>
     <AssemblyName>NSspi</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Kevin Thompson</Authors>
+    <PackageReleaseNotes>Adds multi-targetting to support .Net Standard 2.0.</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/antiduh/nsspi</PackageProjectUrl>
+    <Version>0.3.0.0</Version>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>nsspi key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <Prefer32Bit>false</Prefer32Bit>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DocumentationFile>NSspi.xml</DocumentationFile>
   </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 Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>NSspi.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>
-    </StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.DirectoryServices.AccountManagement" />
-    <Reference Include="System.Data" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ByteWriter.cs" />
-    <Compile Include="Contexts\ClientContext.cs" />
-    <Compile Include="Contexts\Context.cs" />
-    <Compile Include="Contexts\ContextAttrib.cs" />
-    <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,11 +1,6 @@
 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
 {
@@ -15,7 +10,6 @@ namespace NSspi
         [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 );
@@ -23,6 +17,5 @@ namespace NSspi
         [ReliabilityContract( Consistency.WillNotCorruptState, Cer.Success )]
         [DllImport( "Secur32.dll", EntryPoint = "EnumerateSecurityPackages", CharSet = CharSet.Unicode )]
         internal static extern SecurityStatus EnumerateSecurityPackages( ref int numPackages, ref IntPtr pkgInfoArry );
-
     }
 }

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
 {

NSspi/Properties/AssemblyInfo.cs

@@ -1,18 +1,4 @@
-using System.Reflection;
-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("")]
+using System.Runtime.InteropServices;
 
 // 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
@@ -21,16 +7,3 @@ using System.Runtime.InteropServices;
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [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
 {

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
 {

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
 {

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
 {

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,26 +56,48 @@ 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 --------------
+
+        /// <summary>
+        /// The SSPI operation failed due to insufficient memory resources.
+        /// </summary>
         [EnumString( "Not enough memory." )]
         OutOfMemory = 0x80090300,
 
+        /// <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,
 
+        /// <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>
@@ -88,7 +106,16 @@ namespace NSspi
         [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>
@@ -97,7 +124,16 @@ namespace NSspi
         [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>
@@ -106,23 +142,41 @@ namespace NSspi
         [EnumString( "Impersonation is not supported with the current security package." )]
         NoImpersonation = 0x8009030B,
 
+        /// <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>
+        /// 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,
 
+        /// <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." )]
         MessageAltered = 0x8009030F,
 
+        /// <summary>
+        /// A message was received out of the expected order.
+        /// </summary>
         [EnumString( "A message was received out of the expected order." )]
         OutOfSequence = 0x80090310,
 
+        /// <summary>
+        /// The current security package cannot contact an authenticating authority.
+        /// </summary>
         [EnumString( "The current security package cannot contact an authenticating authority." )]
         NoAuthenticatingAuthority = 0x80090311,
 
@@ -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
 {
@@ -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>

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.6.1"/>
   </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.6.1</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 );
-                serverCred = new ServerCredential( packageName );
+                clientCred = new ClientCurrentCredential( packageName );
+                serverCred = new ServerCurrentCredential( packageName );
 
                 Console.Out.WriteLine( clientCred.PrincipleName );
 
@@ -47,7 +47,6 @@ namespace NSspi
                     ContextAttrib.Delegate
                 );
 
-
                 server = new ServerContext(
                     serverCred,
                     ContextAttrib.MutualAuth |
@@ -75,7 +74,6 @@ namespace NSspi
                     if( serverStatus != SecurityStatus.ContinueNeeded && clientStatus != SecurityStatus.ContinueNeeded ) { break; }
                 }
 
-
                 Console.Out.WriteLine( "Server authority: " + server.AuthorityName );
                 Console.Out.WriteLine( "Server context user: " + server.ContextUserName );
 
@@ -117,10 +115,8 @@ namespace NSspi
                     throw new Exception();
                 }
 
-
                 using( server.ImpersonateClient() )
                 {
-
                 }
 
                 cipherText = client.MakeSignature( plainText );

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", "15.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", "15.9.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.6.1"/>
   </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;

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", "15.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", "15.9.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.6.1</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.6.1"/>
   </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;
 
@@ -97,10 +93,7 @@ namespace TestProtocol
 
                 try
                 {
-                    if( this.Disconnected != null )
-                    {
-                        this.Disconnected();
-                    }
+                    this.Disconnected?.Invoke();
                 }
                 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,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TestProtocol
 {

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", "15.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", "15.9.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.6.1</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.6.1"/>
   </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", "15.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", "15.9.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.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using TestProtocol;
 
@@ -19,7 +13,7 @@ namespace TestServer
 
     public partial class ServerForm : Form
     {
-        private ServerCredential serverCred;
+        private ServerCurrentCredential serverCred;
 
         private ServerContext serverContext;
 
@@ -35,7 +29,7 @@ namespace TestServer
         {
             InitializeComponent();
 
-            this.serverCred = new ServerCredential( PackageNames.Negotiate );
+            this.serverCred = new ServerCurrentCredential( PackageNames.Negotiate );
 
             this.serverContext = new ServerContext(
                 serverCred,
@@ -150,7 +144,6 @@ namespace TestServer
             this.signButton.Enabled = this.connected;
         }
 
-
         private void server_Received( Message message )
         {
             if( message.Operation == ProtocolOp.ClientToken )
@@ -177,7 +170,6 @@ namespace TestServer
             this.initializing = true;
             this.connected = false;
 
-
             this.serverContext.Dispose();
             this.serverContext = new ServerContext(
                 serverCred,
@@ -196,7 +188,6 @@ namespace TestServer
             } );
         }
 
-
         private void HandleInit( Message message )
         {
             byte[] nextToken;
@@ -232,7 +223,6 @@ namespace TestServer
                         MessageBox.Show( "Failed to accept token from client. Sspi error code: " + status );
                     } );
                 }
-
             }
         }
 
@@ -273,6 +263,5 @@ namespace TestServer
                 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.6.1</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,11 @@
 ## Downloads ##
 
-The latest release of NSspi is v0.1.1.
+The latest release of NSspi is v0.2.1. 
 
-* [Source](https://github.com/antiduh/nsspi/archive/0.1.1.zip)
-* [Binaries](https://github.com/antiduh/nsspi/releases/download/0.1.1/nsspi-0.1.1-bin.zip)
+Version 0.2.1 is a minor bugfix release that improves impersonation.
+
+* [Source](https://github.com/antiduh/nsspi/archive/0.2.1.zip)
+* [Binaries](https://github.com/antiduh/nsspi/releases/download/0.2.1/nsspi-0.2.1-bin.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 +13,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.