fix: extension processing in CMP client

siemens · Dec 6, 2023 · 5756a33 · 5756a33
1 parent 2b4ebc2
commit 5756a33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -123,3 +123,8 @@ fix: update some dependencies
 ### 4.0.0 (Nov 8 2023)
 
 feat: implement configurable recipient
+
+### 4.0.1 (Dec 6 2024)
+
+fix: extension processing in CMP client
+
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	<groupId>com.siemens.pki</groupId>
 	<artifactId>CmpRaComponent</artifactId>
 	<packaging>jar</packaging>
-	<version>4.0.0</version>
+	<version>4.0.1</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<parent.basedir>.</parent.basedir>

diff --git a/src/main/java/com/siemens/pki/cmpclientcomponent/main/CmpClient.java b/src/main/java/com/siemens/pki/cmpclientcomponent/main/CmpClient.java
@@ -451,13 +451,14 @@ public EnrollmentResult invokeEnrollment() {
                 case PKIBody.TYPE_CERT_REQ:
                 case PKIBody.TYPE_INIT_REQ: {
                     final String subject = enrollmentContext.getSubject();
-                    ifNotNull(enrollmentContext.getExtensions(), exts -> exts.stream()
+                    final Extension[] extensions = ifNotNull(enrollmentContext.getExtensions(), exts -> exts.stream()
                             .map(ext -> new Extension(
                                     new ASN1ObjectIdentifier(ext.getId()), ext.isCritical(), ext.getValue()))
                             .toArray(Extension[]::new));
                     final CertTemplateBuilder ctb = new CertTemplateBuilder()
                             .setSubject(ifNotNull(subject, X500Name::new))
-                            .setPublicKey(enrolledPublicKeyInfo);
+                            .setPublicKey(enrolledPublicKeyInfo)
+                            .setExtensions((Extensions) ifNotNull(extensions, Extensions::new));
                     requestBody = PkiMessageGenerator.generateIrCrKurBody(
                             enrollmentType, ctb.build(), null, enrolledPrivateKey);
                     pvno = enrolledPrivateKey == null ? PKIHeader.CMP_2021 : PKIHeader.CMP_2000;