support jetty 9

square · May 2, 2014 · 9277784 · 9277784
1 parent 0bb2951
commit 9277784
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/java/src/main/java/jetpack/ssl/ReloadingKeyManager.java b/java/src/main/java/jetpack/ssl/ReloadingKeyManager.java
@@ -29,7 +29,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.X509ExtendedKeyManager;
 import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +40,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 /** X509KeyManager which periodically looks for a newer key and transparently reloads. */
-public class ReloadingKeyManager implements X509KeyManager {
+public class ReloadingKeyManager extends X509ExtendedKeyManager {
   public static final Duration DEFAULT_RELOAD_INTERVAL = Duration.standardHours(2);
   private static final Logger logger = LoggerFactory.getLogger(ReloadingKeyManager.class);
 
@@ -144,6 +145,16 @@ public PrivateKey getPrivateKey(String keyAlias) {
     }
   }
 
+  @Override
+  public String chooseEngineClientAlias(String[] strings, Principal[] principals, SSLEngine sslEngine) {
+    return keyName;
+  }
+
+  @Override
+  public String chooseEngineServerAlias(String s, Principal[] principals, SSLEngine sslEngine) {
+    return keyName;
+  }
+
   private void reloadKeyStoreOnInterval() {
     if (Duration.ZERO.isEqual(reloadInterval)) return;