chore: withoutPadding, fixed tests

WorldHealthOrganization · Jul 16, 2024 · d2949f1 · d2949f1
1 parent 6273595
commit d2949f1
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 80 deletions.
diff --git a/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java b/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java
@@ -86,8 +86,10 @@ public static class EcPublicKeyJwk extends PublicKeyJwk {
          */
         public EcPublicKeyJwk(ECPublicKey ecPublicKey, List<String> base64EncodedCertificates) {
             super("EC", base64EncodedCertificates);
-            valueX = Base64.getUrlEncoder().encodeToString(ecPublicKey.getW().getAffineX().toByteArray());
-            valueY = Base64.getUrlEncoder().encodeToString(ecPublicKey.getW().getAffineY().toByteArray());
+            valueX = Base64.getUrlEncoder().withoutPadding()
+            .encodeToString(ecPublicKey.getW().getAffineX().toByteArray());
+            valueY = Base64.getUrlEncoder().withoutPadding()
+            .encodeToString(ecPublicKey.getW().getAffineY().toByteArray());
 
             ECNamedCurveSpec curveSpec = (ECNamedCurveSpec) ecPublicKey.getParams();
             switch (curveSpec.getName()) {
@@ -118,7 +120,8 @@ public static class RsaPublicKeyJwk extends PublicKeyJwk {
          */
         public RsaPublicKeyJwk(RSAPublicKey rsaPublicKey, List<String> base64EncodedCertificates) {
             super("RSA", base64EncodedCertificates);
-            valueN = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray()).split("=")[0];
+            valueN = Base64.getUrlEncoder().withoutPadding()
+            .encodeToString(rsaPublicKey.getModulus().toByteArray());
             valueE = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getPublicExponent().toByteArray());
         }
     }