Skip to content

Add private key password support to GDS Client certificate flows #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romanett merged 1 commit into from
Aug 13, 2026
Merged

Add private key password support to GDS Client certificate flows #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Samples/GDS/Client/Controls/ApplicationCertificateControl.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 47 additions & 4 deletions Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public async Task InitializeAsync(
m_certificate = null;
m_temporaryCertificateCreated = false;
m_certificatePassword = null;
PrivateKeyPasswordTextBox.Text = string.Empty;

CertificateRequestTimer.Enabled = false;
RequestProgressLabel.Visible = false;
Expand Down Expand Up @@ -260,9 +261,46 @@ private async Task<X509Certificate2> FindCertificateAsync(CertificateIdentifier
return null;
}

private Task<X509Certificate2> LoadPrivateKeyAsync(CertificateIdentifier id, X509Certificate2 certificate, char[] password)
private async Task<X509Certificate2> LoadPrivateKeyAsync(CertificateIdentifier id, X509Certificate2 certificate, char[] password)
{
return Task.FromResult(certificate);
if (certificate == null)
{
return null;
}

// Certificate already carries an exportable private key, nothing to load.
if (certificate.HasPrivateKey)
{
return certificate;
}

if (id == null || String.IsNullOrEmpty(id.StorePath))
{
return certificate;
}

var storeIdentifier = new CertificateStoreIdentifier(id.StorePath, false);
using (ICertificateStore store = storeIdentifier.OpenStore(m_telemetry))
{
if (store == null || !store.SupportsLoadPrivateKey)
{
return certificate;
}

Certificate withPrivateKey = await store.LoadPrivateKeyAsync(
certificate.Thumbprint,
certificate.Subject,
null,
id.CertificateType,
(password != null && password.Length > 0) ? password : null);

if (withPrivateKey != null)
{
return withPrivateKey.AsX509Certificate2();
}
}

return certificate;
}
private async Task RequestNewCertificatePullModeAsync(object sender, EventArgs e)
{
Expand Down Expand Up @@ -410,7 +448,7 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
X509Certificate2 oldCertificate = await FindCertificateAsync(cid);
if (oldCertificate != null && oldCertificate.HasPrivateKey)
{
oldCertificate = await LoadPrivateKeyAsync(cid, oldCertificate, []);
oldCertificate = await LoadPrivateKeyAsync(cid, oldCertificate, m_certificatePassword?.ToCharArray());
newCert = DefaultCertificateFactory.Instance.CreateWithPrivateKey(Certificate.From(newCert), Certificate.From(m_temporaryCertificateCreated ? m_certificate : oldCertificate)).AsX509Certificate2();
await store.DeleteAsync(oldCertificate.Thumbprint);
}
Expand All @@ -421,7 +459,7 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
}
else
{
newCert = GdsCertificateLoader.LoadPkcs12(privateKeyPFX.ToArray(), string.Empty, X509KeyStorageFlags.Exportable);
newCert = GdsCertificateLoader.LoadPkcs12(privateKeyPFX.ToArray(), m_certificatePassword ?? string.Empty, X509KeyStorageFlags.Exportable);
}
await store.AddAsync(Certificate.From(newCert));
if (m_temporaryCertificateCreated)
Expand Down Expand Up @@ -611,5 +649,10 @@ private void Button_MouseLeave(object sender, EventArgs e)
((Control)sender).BackColor = Color.MidnightBlue;
}

private void PrivateKeyPasswordTextBox_TextChanged(object sender, EventArgs e)
{
m_certificatePassword = PrivateKeyPasswordTextBox.Text;
}

}
}
Loading