63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From 2921cf92d8968fef21d3459523f0c469ac64089a Mon Sep 17 00:00:00 2001
|
|
From: wang--ge <wang__ge@126.com>
|
|
Date: Wed, 25 May 2022 16:47:46 +0800
|
|
Subject: [PATCH] add abstract method for class JSSUtil
|
|
|
|
---
|
|
tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java | 15 +++++++++++++--
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java b/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java
|
|
index cad3163..2f6faa3 100644
|
|
--- a/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java
|
|
+++ b/tomcat-8.5/src/org/dogtagpki/tomcat/JSSUtil.java
|
|
@@ -19,6 +19,8 @@
|
|
|
|
package org.dogtagpki.tomcat;
|
|
|
|
+import java.security.NoSuchAlgorithmException;
|
|
+
|
|
import java.util.Arrays;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
@@ -30,6 +32,7 @@ import javax.net.ssl.KeyManagerFactory;
|
|
import javax.net.ssl.TrustManager;
|
|
import javax.net.ssl.TrustManagerFactory;
|
|
import javax.net.ssl.SSLEngine;
|
|
+import javax.net.ssl.SSLSessionContext;
|
|
|
|
import org.apache.juli.logging.Log;
|
|
import org.apache.juli.logging.LogFactory;
|
|
@@ -101,13 +104,11 @@ public class JSSUtil extends SSLUtilBase {
|
|
return new TrustManager[] { new JSSNativeTrustManager() };
|
|
}
|
|
|
|
- @Override
|
|
public SSLContext createSSLContextInternal(List<String> negotiableProtocols) throws Exception {
|
|
logger.debug("JSSUtil createSSLContextInternal(...) keyAlias=" + keyAlias);
|
|
return new JSSContext(keyAlias);
|
|
}
|
|
|
|
- @Override
|
|
public boolean isTls13RenegAuthAvailable() {
|
|
logger.debug("JSSUtil: isTls13RenegAuthAvailable()");
|
|
return true;
|
|
@@ -133,4 +134,14 @@ public class JSSUtil extends SSLUtilBase {
|
|
|
|
return ciphers;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public void configureSessionContext(SSLSessionContext sslSessionContext) {
|
|
+ logger.debug("JSSUtil: configureSessionContext");
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public SSLContext createSSLContext(List<String> negotiableProtocols) throws NoSuchAlgorithmException {
|
|
+ return new JSSContext(keyAlias);
|
|
+ }
|
|
}
|
|
--
|
|
2.33.0
|
|
|