From d43b16bb2c9af0b22f55de2cf12a80582433f7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Wed, 31 May 2017 19:31:40 +0200
Subject: [PATCH] Remove pebble workaround for kid field

---
 .../shredzone/acme4j/connector/DefaultConnection.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
index fae75bdb..e29f9041 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java
@@ -52,7 +52,6 @@ import org.shredzone.acme4j.exception.AcmeRetryAfterException;
 import org.shredzone.acme4j.exception.AcmeServerException;
 import org.shredzone.acme4j.exception.AcmeUnauthorizedException;
 import org.shredzone.acme4j.exception.AcmeUserActionRequiredException;
-import org.shredzone.acme4j.provider.pebble.Pebble;
 import org.shredzone.acme4j.util.AcmeUtils;
 import org.shredzone.acme4j.util.JSON;
 import org.shredzone.acme4j.util.JSONBuilder;
@@ -186,13 +185,7 @@ public class DefaultConnection implements Connection {
             if (enforceJwk || session.getKeyIdentifier() == null) {
                 jws.getHeaders().setJwkHeaderValue("jwk", jwk);
             } else {
-                // TODO PEBBLE: cannot process "kid" yet, send "jwk" instead
-                // https://github.com/letsencrypt/pebble/issues/23
-                if (Pebble.workaround()) {
-                    jws.getHeaders().setJwkHeaderValue("jwk", jwk);
-                } else {
-                    jws.getHeaders().setObjectHeaderValue("kid", session.getKeyIdentifier());
-                }
+                jws.getHeaders().setObjectHeaderValue("kid", session.getKeyIdentifier());
             }
 
             jws.setAlgorithmHeaderValue(keyAlgorithm(jwk));