Skip to content

Remove BouncyCastle dependency from GDS Server #3393

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
marcschier merged 8 commits into from
Dec 11, 2025
Merged

Remove BouncyCastle dependency from GDS Server #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
58de7cd
Initial plan
Copilot Dec 8, 2025
3206e70
Replace BouncyCastle dependency with .NET Framework APIs for CSR pars…
Copilot Dec 8, 2025
bd974b9
Address code review feedback: improve error handling and add RSA key …
Copilot Dec 8, 2025
a1eb1a9
Add comprehensive tests for PKCS#10 CSR parsing functionality
Copilot Dec 9, 2025
dcbc407
Fix collection expression syntax for broader framework compatibility
Copilot Dec 9, 2025
2ef39d0
Fix ECDSA signature verification and remove useless test
Copilot Dec 9, 2025
5a453f6
Fix ECDSA signature format conversion based on code review
Copilot Dec 9, 2025
1d2cc39
Improve RSA/ECDSA CSR parsing and .NET Framework test logic
marcschier Dec 11, 2025
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
65 changes: 9 additions & 56 deletions Libraries/Opc.Ua.Gds.Server.Common/CertificateGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,7 @@ public virtual Task VerifySigningRequestAsync(
{
try
{
var pkcs10CertificationRequest
= new Org.BouncyCastle.Pkcs.Pkcs10CertificationRequest(
certificateRequest);
var pkcs10CertificationRequest = new Pkcs10CertificationRequest(certificateRequest);

if (!pkcs10CertificationRequest.Verify())
{
Expand All @@ -355,9 +353,8 @@ var pkcs10CertificationRequest
"CSR signature invalid.");
}

Org.BouncyCastle.Asn1.Pkcs.CertificationRequestInfo info =
pkcs10CertificationRequest.GetCertificationRequestInfo();
X509SubjectAltNameExtension altNameExtension = GetAltNameExtensionFromCSRInfo(info);
X509SubjectAltNameExtension altNameExtension =
Pkcs10Utils.GetSubjectAltNameExtension(pkcs10CertificationRequest.Attributes);
if (altNameExtension != null &&
altNameExtension.Uris.Count > 0 &&
!altNameExtension.Uris.Contains(application.ApplicationUri))
Expand All @@ -383,9 +380,7 @@ public virtual async Task<X509Certificate2> SigningRequestAsync(
{
try
{
var pkcs10CertificationRequest
= new Org.BouncyCastle.Pkcs.Pkcs10CertificationRequest(
certificateRequest);
var pkcs10CertificationRequest = new Pkcs10CertificationRequest(certificateRequest);

if (!pkcs10CertificationRequest.Verify())
{
Expand All @@ -394,9 +389,8 @@ var pkcs10CertificationRequest
"CSR signature invalid.");
}

Org.BouncyCastle.Asn1.Pkcs.CertificationRequestInfo info =
pkcs10CertificationRequest.GetCertificationRequestInfo();
X509SubjectAltNameExtension altNameExtension = GetAltNameExtensionFromCSRInfo(info);
X509SubjectAltNameExtension altNameExtension =
Pkcs10Utils.GetSubjectAltNameExtension(pkcs10CertificationRequest.Attributes);
if (altNameExtension != null)
{
if (altNameExtension.Uris.Count > 0 &&
Expand Down Expand Up @@ -433,7 +427,7 @@ var pkcs10CertificationRequest
m_telemetry,
ct)
.ConfigureAwait(false);
var subjectName = new X500DistinguishedName(info.Subject.GetEncoded());
var subjectName = pkcs10CertificationRequest.Subject;

ICertificateBuilder builder = CertificateBuilder
.Create(subjectName)
Expand All @@ -445,13 +439,13 @@ var pkcs10CertificationRequest
return TryGetECCCurve(certificateType, out ECCurve curve)
? builder
.SetIssuer(signingKey)
.SetECDsaPublicKey(info.SubjectPublicKeyInfo.GetEncoded())
.SetECDsaPublicKey(pkcs10CertificationRequest.SubjectPublicKeyInfo)
.CreateForECDsa()
: builder
.SetHashAlgorithm(X509Utils.GetRSAHashAlgorithmName(
Configuration.DefaultCertificateHashSize))
.SetIssuer(signingKey)
.SetRSAPublicKey(info.SubjectPublicKeyInfo.GetEncoded())
.SetRSAPublicKey(pkcs10CertificationRequest.SubjectPublicKeyInfo)
.CreateForRSA();
}
catch (Exception ex) when (ex is not ServiceResultException)
Expand Down Expand Up @@ -766,47 +760,6 @@ X509CRL crl in await authorityStore
}
}

protected X509SubjectAltNameExtension GetAltNameExtensionFromCSRInfo(
Org.BouncyCastle.Asn1.Pkcs.CertificationRequestInfo info)
{
try
{
for (int i = 0; i < info.Attributes.Count; i++)
{
var sequence = Org.BouncyCastle.Asn1.Asn1Sequence
.GetInstance(info.Attributes[i].ToAsn1Object());
var oid = Org.BouncyCastle.Asn1.DerObjectIdentifier
.GetInstance(sequence[0].ToAsn1Object());
if (oid.Equals(
Org.BouncyCastle.Asn1.Pkcs.PkcsObjectIdentifiers.Pkcs9AtExtensionRequest))
{
var extensionInstance = Org.BouncyCastle.Asn1.Asn1Set
.GetInstance(sequence[1]);
var extensionSequence = Org.BouncyCastle.Asn1.Asn1Sequence
.GetInstance(extensionInstance[0]);
var extensions = Org.BouncyCastle.Asn1.X509.X509Extensions
.GetInstance(extensionSequence);
Org.BouncyCastle.Asn1.X509.X509Extension extension = extensions
.GetExtension(
Org.BouncyCastle.Asn1.X509.X509Extensions.SubjectAlternativeName);
var asnEncodedAltNameExtension = new AsnEncodedData(
Org.BouncyCastle.Asn1.X509.X509Extensions.SubjectAlternativeName
.ToString(),
extension.Value.GetOctets());
return new X509SubjectAltNameExtension(
asnEncodedAltNameExtension,
extension.IsCritical);
}
}
}
catch
{
throw new ServiceResultException(
StatusCodes.BadInvalidArgument,
"CSR altNameExtension invalid.");
}
return null;
}

private readonly ITelemetryContext m_telemetry;
private readonly ILogger m_logger;
Expand Down
4 changes: 1 addition & 3 deletions Libraries/Opc.Ua.Gds.Server.Common/Opc.Ua.Gds.Server.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@
<ItemGroup>
<EmbeddedResource Include="Model\Opc.Ua.Gds.PredefinedNodes.uanodes" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle.Cryptography" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj" />
<ProjectReference Include="..\Opc.Ua.Security.Certificates\Opc.Ua.Security.Certificates.csproj" />
<ProjectReference Include="..\Opc.Ua.Server\Opc.Ua.Server.csproj" />
</ItemGroup>
</Project>
Loading
Loading