tomcatjss/0001-add-abstract-method-for-class-JSSUtil.patch
2022-10-17 14:37:50 +08:00

71 lines
2.2 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
---
.../main/java/org/dogtagpki/tomcat/JSSUtil.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java b/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
index 8370370..9c3326d 100644
--- a/tomcat-9.0/src/main/java/org/dogtagpki/tomcat/JSSUtil.java
+++ b/tomcat-9.0/src/main/java/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.HashSet;
@@ -28,6 +30,7 @@ import java.util.Set;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
@@ -48,6 +51,7 @@ public class JSSUtil extends SSLUtilBase {
private Set<String> protocols;
private Set<String> ciphers;
+
public JSSUtil(SSLHostConfigCertificate cert) {
super(cert);
@@ -95,13 +99,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;
@@ -127,4 +129,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.27.0