v2.1.6

ReleaseNotes.md

@@ -2,6 +2,11 @@
 
 # Release notes GemLibPki
 
+## Release 2.1.6
+
+- add new certificate types
+- update dependencies
+
 ## Release 2.1.5
 
 - update dependencies

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>de.gematik.pki</groupId>
   <artifactId>gemLibPki</artifactId>
-  <version>2.1.5</version>
+  <version>2.1.6</version>
   <packaging>jar</packaging>
   <name>GemLibPki</name>
   <description>library for implementation and tests of the gematik pki specification</description>
@@ -44,7 +44,7 @@
   </issueManagement>
 
   <properties>
-    <project.build.outputTimestamp>1722427771</project.build.outputTimestamp>
+    <project.build.outputTimestamp>1723555013</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.encoding>${project.build.sourceEncoding}</maven.compiler.encoding>
     <version.java>17</version.java>
@@ -54,7 +54,7 @@
     <version.assertj>3.26.3</version.assertj>
     <version.awaitility>4.2.1</version.awaitility>
     <version.bouncycastle>1.78.1</version.bouncycastle>
-    <version.commons-lang3>3.15.0</version.commons-lang3>
+    <version.commons-lang3>3.16.0</version.commons-lang3>
     <version.dss-tsl-validation>6.0</version.dss-tsl-validation>
     <version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
     <version.junit-jupiter>5.10.3</version.junit-jupiter>
@@ -63,7 +63,7 @@
     <version.mockito>5.12.0</version.mockito>
     <version.unirest-java-core>4.4.4</version.unirest-java-core>
     <version.wiremock>3.9.1</version.wiremock>
-    <version.xades4j>2.2.2</version.xades4j>
+    <version.xades4j>2.3.0</version.xades4j>
     <version.xmlunit>2.10.0</version.xmlunit>
 
     <!--  plugins -->

src/main/java/de/gematik/pki/gemlibpki/certificate/CertificateProfile.java

@@ -18,17 +18,22 @@
 
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_ANY;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_EGK_AUT;
+import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_EGK_AUT_ALT;
+import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_EGK_SIG;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_FD_OSIG;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_FD_SIG;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_FD_TLS_C;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_FD_TLS_S;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_GSMCK_AK_AUT;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_HBA_AUT;
+import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_HBA_ENC;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_HSK_ENC;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_HSK_SIG;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_SMC_B_AUT;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_SMC_B_ENC;
 import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_SMC_B_OSIG;
+import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_VPNK_VPN;
+import static de.gematik.pki.gemlibpki.certificate.CertificateType.CERT_TYPE_VPNK_VPN_SIS;
 import static de.gematik.pki.gemlibpki.certificate.ExtendedKeyUsage.EXT_KEYUSAGE_ID_KP_CLIENTAUTH;
 import static de.gematik.pki.gemlibpki.certificate.ExtendedKeyUsage.EXT_KEYUSAGE_ID_KP_EMAILPROTECTION;
 import static de.gematik.pki.gemlibpki.certificate.ExtendedKeyUsage.EXT_KEYUSAGE_ID_KP_SERVERAUTH;
@@ -58,7 +63,6 @@ public enum CertificateProfile {
       List.of(KEYUSAGE_DIGITAL_SIGNATURE),
       List.of(EXT_KEYUSAGE_ID_KP_CLIENTAUTH, EXT_KEYUSAGE_ID_KP_SERVERAUTH),
       true),
-
   CERT_PROFILE_C_CH_AUT_RSA(
       CERT_TYPE_EGK_AUT,
       List.of(KEYUSAGE_DIGITAL_SIGNATURE, KEYUSAGE_KEY_ENCIPHERMENT),
@@ -69,7 +73,13 @@ public enum CertificateProfile {
       List.of(KEYUSAGE_DIGITAL_SIGNATURE),
       List.of(EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
       false),
-
+  CERT_PROFILE_C_EGK_AUT_ALT_ECC(
+      CERT_TYPE_EGK_AUT_ALT,
+      List.of(KEYUSAGE_DIGITAL_SIGNATURE),
+      List.of(EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
+      true),
+  CERT_PROFILE_C_EGK_SIG_ECC(CERT_TYPE_EGK_SIG, List.of(KEYUSAGE_NON_REPUDIATION), List.of(), true),
+  CERT_PROFILE_C_HBA_ENC_ECC(CERT_TYPE_HBA_ENC, List.of(KEYUSAGE_KEY_AGREEMENT), List.of(), true),
   CERT_PROFILE_C_HP_AUT_RSA(
       CERT_TYPE_HBA_AUT,
       List.of(KEYUSAGE_DIGITAL_SIGNATURE, KEYUSAGE_KEY_ENCIPHERMENT),
@@ -137,12 +147,21 @@ public enum CertificateProfile {
       List.of(KEYUSAGE_KEY_AGREEMENT),
       List.of(EXT_KEYUSAGE_ID_KP_SERVERAUTH, EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
       true),
-
   CERT_PROFILE_C_HSK_SIG_ECC(
       CERT_TYPE_HSK_SIG,
       List.of(KEYUSAGE_NON_REPUDIATION),
       List.of(EXT_KEYUSAGE_ID_KP_SERVERAUTH, EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
       true),
+  CERT_PROFILE_C_VPNK_VPN_ECC(
+      CERT_TYPE_VPNK_VPN,
+      List.of(KEYUSAGE_DIGITAL_SIGNATURE),
+      List.of(EXT_KEYUSAGE_ID_KP_SERVERAUTH, EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
+      true),
+  CERT_PROFILE_C_VPNK_VPN_SIS_ECC(
+      CERT_TYPE_VPNK_VPN_SIS,
+      List.of(KEYUSAGE_DIGITAL_SIGNATURE),
+      List.of(EXT_KEYUSAGE_ID_KP_SERVERAUTH, EXT_KEYUSAGE_ID_KP_CLIENTAUTH),
+      true),
 
   CERT_PROFILE_ANY(CERT_TYPE_ANY, List.of(), List.of(), false);
 

src/main/java/de/gematik/pki/gemlibpki/certificate/CertificateType.java

@@ -26,9 +26,11 @@ public enum CertificateType {
   CERT_TYPE_AK_AUT("C.AK.AUT", "oid_ak_aut", "1.2.276.0.76.4.79"),
   CERT_TYPE_CM_TLS_CS("C.CM.TLS-CS", "oid_cm_tls_c", "1.2.276.0.76.4.175"),
   CERT_TYPE_EGK_AUT("C.CH.AUT", "oid_egk_aut", "1.2.276.0.76.4.70"),
+  CERT_TYPE_EGK_AUT_ALT("C.CH.AUT_ALT", "oid_egk_aut_alt", "1.2.276.0.76.4.212"),
   CERT_TYPE_EGK_AUTN("C.CH.AUTN", "oid_egk_autn", "1.2.276.0.76.4.71"),
   CERT_TYPE_EGK_ENC("C.CH.ENC", "oid_egk_enc", "1.2.276.0.76.4.68"),
   CERT_TYPE_EGK_ENCV("C.CH.ENCV", "oid_egk_encv", "1.2.276.0.76.4.69"),
+  CERT_TYPE_EGK_SIG("C.CH.SIG", "oid_egk_sig", "1.2.276.0.76.4.367"),
   CERT_TYPE_FD_AUT("C.FD.AUT", "oid_fd_aut", "1.2.276.0.76.4.155"),
   CERT_TYPE_FD_ENC("C.FD.ENC", "oid_fd_enc", "1.2.276.0.76.4.202"),
   CERT_TYPE_FD_OSIG("C.FD.OSIG", "oid_fd_osig", "1.2.276.0.76.4.283"),
@@ -39,6 +41,7 @@ public enum CertificateType {
   CERT_TYPE_GSMCK_NK_VPN("C.NK.VPN", "oid_nk_vpn", "1.2.276.0.76.4.80"),
   CERT_TYPE_GSMCK_SAK_AUT("C.SAK.AUT", "oid_sak_aut", "1.2.276.0.76.4.113"),
   CERT_TYPE_HBA_AUT("C.HP.AUT", "oid_hba_aut", "1.2.276.0.76.4.75"),
+  CERT_TYPE_HBA_ENC("C.HP.ENC", "oid_hba_enc", "1.2.276.0.76.4.74"),
   CERT_TYPE_HBA_QES("C.HP.QES", "oid_hba_qes", "1.2.276.0.76.4.72"),
   CERT_TYPE_HSK_ENC("C.HSK.ENC", "oid_hsk_enc", "1.2.276.0.76.4.301"),
   CERT_TYPE_HSK_SIG("C.HSK.SIG", "oid_hsk_sig", "1.2.276.0.76.4.300"),
@@ -49,6 +52,8 @@ public enum CertificateType {
   CERT_TYPE_SMC_B_ENC("C.HCI.ENC", "oid_smc_b_enc", "1.2.276.0.76.4.76"),
   CERT_TYPE_SMC_B_OSIG("C.HCI.OSIG", "oid_smc_b_osig", "1.2.276.0.76.4.78"),
   CERT_TYPE_SMKT_AUT("C.SMKT.AUT", "oid_smkt_aut", "1.2.276.0.76.4.82"),
+  CERT_TYPE_VPNK_VPN("C.VPNK.VPN", "oid_vpnk_vpn", "1.2.276.0.76.4.81"),
+  CERT_TYPE_VPNK_VPN_SIS("C.VPNK.VPN-SIS", "oid_vpnk_vpn_sis", "1.2.276.0.76.4.165"),
   CERT_TYPE_ZD_SIG("C.ZD.SIG", "oid_zd_sig", "1.2.276.0.76.4.287"),
   CERT_TYPE_ZD_TLS_S("C.ZD.TLS-S", "oid_zd_tls_s", "1.2.276.0.76.4.157"),