Commit 01b5c02a authored by Jason Williams's avatar Jason Williams
Browse files

More cleanup on cert change

parent 93114a11
Loading
Loading
Loading
Loading
+1 −18
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace Microsoft.Tools.WindowsDevicePortal
        /// Gets the root certificate from the device.
        /// </summary>
        /// <returns>The device certificate.</returns>
        private async Task<X509Certificate2> GetDeviceCertificate()
        private async Task<X509Certificate2> GetRootDeviceCertificate()
        {
            throw new NotSupportedException();
        }
@@ -44,22 +44,5 @@ namespace Microsoft.Tools.WindowsDevicePortal
        {
            return false;
        }

        /// <summary>
        /// No-op version of cert validation for skipping the validation
        /// </summary>
        /// <param name="sender">the sender</param>
        /// <param name="cert">the certificate</param>
        /// <param name="chain">cert chain</param>
        /// <param name="policyErrors">policy Errors</param>
        /// <returns>Always returns true since validation is skipped.</returns>
        private bool ServerCertificateNonValidation(
            object sender,
            X509Certificate cert,
            X509Chain chain,
            SslPolicyErrors policyErrors)
        {
            return true;
        }
    }
}
+2 −10
Original line number Diff line number Diff line
@@ -24,22 +24,14 @@ namespace Microsoft.Tools.WindowsDevicePortal
        /// /// <param name="validateCertificate">Whether the certificate should be validated.</param>
        /// <returns>Response data as a stream.</returns>
        private async Task<Stream> Get(
            Uri uri, 
            bool validateCertificate = true)
            Uri uri)
        {
            MemoryStream dataStream = null;

            WebRequestHandler handler = new WebRequestHandler();
            handler.UseDefaultCredentials = false;
            handler.Credentials = this.deviceConnection.Credentials;
            if (validateCertificate)
            {
            handler.ServerCertificateValidationCallback = this.ServerCertificateValidation;
            }
            else
            {
                handler.ServerCertificateValidationCallback = this.ServerCertificateNonValidation;
            }

            using (HttpClient client = new HttpClient(handler))
            {