Commit 12317015 authored by David Kline's avatar David Kline
Browse files

update certificate issuer name and the .net side as well

parent da412532

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs

+3 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace Microsoft.Tools.WindowsDevicePortal 
        /// <summary>

        /// Issuer for the device certificate.

        /// </summary>

        public static readonly string DevicePortalCertificateIssuer = "CN=Microsoft Windows Web Management";

        public static readonly string DevicePortalCertificateIssuer = "Microsoft Windows Web Management";



        /// <summary>

        /// Endpoint used to access the certificate.
@@ -149,11 +149,9 @@ namespace Microsoft.Tools.WindowsDevicePortal 
                        DeviceConnectionStatus.Connecting,

                        DeviceConnectionPhase.AcquiringCertificate,

                        connectionPhaseDescription);                  

#if WINDOWS_UWP

                    this.SetDeviceCertificate(await this.GetDeviceCertificate());

#else



                    this.deviceConnection.SetDeviceCertificate(await this.GetDeviceCertificate());

#endif



                    certificateAcquired = true;

                }

                catch

WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/CertificateHandling.cs

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ namespace Microsoft.Tools.WindowsDevicePortal 


                            // Validate the issuer.

                            certificate = new X509Certificate2(certData);

                            if (!certificate.IssuerName.Name.StartsWith(DevicePortalCertificateIssuer))

                            if (!certificate.IssuerName.Name.Contains(DevicePortalCertificateIssuer))

                            {

                                certificate = null;

                                throw new DevicePortalException(