From 34c7950c75601f73ea216fa3f1f970bf4881eac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Thu, 24 Dec 2015 16:13:16 +0100 Subject: [PATCH] Use PublicJsonWebKey instead of JsonWebKey --- .../java/org/shredzone/acme4j/impl/DefaultConnection.java | 4 ++-- .../src/main/java/org/shredzone/acme4j/util/ClaimBuilder.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/DefaultConnection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/DefaultConnection.java index 87df941b..5d95d12f 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/DefaultConnection.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/DefaultConnection.java @@ -33,7 +33,7 @@ import java.util.regex.Pattern; import org.jose4j.base64url.Base64Url; import org.jose4j.json.JsonUtil; -import org.jose4j.jwk.JsonWebKey; +import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.jws.JsonWebSignature; import org.jose4j.lang.JoseException; @@ -140,7 +140,7 @@ public class DefaultConnection implements Connection { conn.setRequestProperty("Content-Type", "application/json"); conn.setDoOutput(true); - final JsonWebKey jwk = JsonWebKey.Factory.newJwk(keypair.getPublic()); + final PublicJsonWebKey jwk = PublicJsonWebKey.Factory.newPublicJwk(keypair.getPublic()); JsonWebSignature jws = new JsonWebSignature(); jws.setPayload(claims.toString()); diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/ClaimBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/util/ClaimBuilder.java index 27f346fd..d20a7d47 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/ClaimBuilder.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/util/ClaimBuilder.java @@ -22,6 +22,7 @@ import java.util.TreeMap; import org.jose4j.base64url.Base64Url; import org.jose4j.json.JsonUtil; import org.jose4j.jwk.JsonWebKey; +import org.jose4j.jwk.PublicJsonWebKey; import org.jose4j.lang.JoseException; import org.shredzone.acme4j.connector.Resource; @@ -122,7 +123,7 @@ public class ClaimBuilder { } try { - final JsonWebKey jwk = JsonWebKey.Factory.newJwk(publickey); + final PublicJsonWebKey jwk = PublicJsonWebKey.Factory.newPublicJwk(publickey); Map jwkParams = jwk.toParams(JsonWebKey.OutputControlLevel.PUBLIC_ONLY); object(key).putAll(jwkParams); return this;