Skip to content
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

Jump to bottom

[GDS Client] Fix Certificate Request when private Key of existing Certificate is not exportable #607

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+31 −3
Open

[GDS Client] Fix Certificate Request when private Key of existing Certificate is not exportable #607

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33cd390
only use CSR when Private Key is exportable
romanett May 12, 2024
14d3dee
ask user before proceeding with new keypair request
romanett Jul 2, 2024
e64cfc5
Merge branch 'master' into fixRequestWhenPrivateKeyIsNotExportable
romanett Jul 21, 2024
c6da2b5
Merge branch 'OPCFoundation:master' into fixRequestWhenPrivateKeyIsNo…
romanett Oct 22, 2024
48ff0ec
create temporary cert for csr
romanett Oct 22, 2024
3106d9b
add comment
romanett Oct 22, 2024
83d3b23
use new cert for replacing
romanett Oct 26, 2024
46fff54
remove using statement referencing bouncy castle
romanett Oct 26, 2024
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
34 changes: 31 additions & 3 deletions Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
* http://opcfoundation.org/License/MIT/1.00/
* ======================================================================*/

using Opc.Ua.Gds;
using Opc.Ua.Security.Certificates;
using System;
using System.Drawing;
Expand All @@ -50,6 +49,7 @@ public ApplicationCertificateControl()
private ServerPushConfigurationClient m_server;
private RegisteredApplication m_application;
private X509Certificate2 m_certificate;
private bool m_temporaryCertificateCreated;
private string m_certificatePassword;

public async Task Initialize(
Expand All @@ -64,6 +64,7 @@ public async Task Initialize(
m_server = server;
m_application = application;
m_certificate = null;
m_temporaryCertificateCreated = false;
m_certificatePassword = null;

CertificateRequestTimer.Enabled = false;
Expand Down Expand Up @@ -236,10 +237,31 @@ private async Task RequestNewCertificatePullMode(object sender, EventArgs e)
SubjectName = Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName)
};
m_certificate = await id.Find(true);
//test if private key is available & exportable, else create new temporary certificate for csr
if (m_certificate != null &&
m_certificate.HasPrivateKey)
{
m_certificate = await id.LoadPrivateKey(m_certificatePassword);
try
{
//this line fails with a CryptographicException if export of private key is not allowed
_ = m_certificate.GetRSAPrivateKey().ExportParameters(true);
//proceed with a CSR using the exportable private key
m_certificate = await id.LoadPrivateKey(m_certificatePassword);
}
catch
{
//create temporary cert to generate csr from
m_certificate = CertificateFactory.CreateCertificate(
X509Utils.GetApplicationUriFromCertificate(m_certificate),
m_application.ApplicationName,
Utils.ReplaceDCLocalhost(m_application.CertificateSubjectName),
m_application.GetDomainNames(m_certificate))
.SetNotBefore(DateTime.Today.AddDays(-1))
.SetNotAfter(DateTime.Today.AddDays(14))
.SetRSAKeySize((ushort)(m_certificate.GetRSAPublicKey()?.KeySize ?? 0))
.CreateForRSA();
m_temporaryCertificateCreated = true;
}
}
}

Expand Down Expand Up @@ -347,7 +369,7 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
if (oldCertificate != null && oldCertificate.HasPrivateKey)
{
oldCertificate = await cid.LoadPrivateKey(string.Empty);
newCert = CertificateFactory.CreateCertificateWithPrivateKey(newCert, oldCertificate);
newCert = CertificateFactory.CreateCertificateWithPrivateKey(newCert, m_temporaryCertificateCreated ? m_certificate : oldCertificate);
await store.Delete(oldCertificate.Thumbprint);
}
else
Expand All @@ -361,6 +383,12 @@ private async void CertificateRequestTimer_Tick(object sender, EventArgs e)
newCert = CertificateFactory.Load(newCert, true);
}
await store.Add(newCert);
if (m_temporaryCertificateCreated)
{
m_certificate.Dispose();
m_certificate = null;
m_temporaryCertificateCreated = false;
}
}
}
else
Expand Down
Loading