summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java
diff options
context:
space:
mode:
authorSimon Rettberg2023-04-06 16:26:07 +0200
committerSimon Rettberg2023-04-06 16:26:07 +0200
commit00d17e684f9ad7b993c09d4cd962d9809e8319fc (patch)
treea54679a614cdffd89c3697f010d1f0a4e351ee1c /dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java
parent[client] Increase log level for parts of apache http-client (diff)
downloadtutor-module-00d17e684f9ad7b993c09d4cd962d9809e8319fc.tar.gz
tutor-module-00d17e684f9ad7b993c09d4cd962d9809e8319fc.tar.xz
tutor-module-00d17e684f9ad7b993c09d4cd962d9809e8319fc.zip
[client] Completely change proxy detection code
Try to turn the old mess into a slightly less confusing new mess
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java
index 648a0403..34997133 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java
@@ -18,6 +18,7 @@ import org.openslx.dozmod.authentication.FingerprintManager;
import org.openslx.dozmod.gui.Gui.GuiCallable;
import org.openslx.dozmod.gui.helper.I18n;
import org.openslx.dozmod.gui.helper.MessageType;
+import org.openslx.dozmod.util.ProxyConfigurator;
public class GraphicalCertHandler {
@@ -114,7 +115,9 @@ public class GraphicalCertHandler {
private GraphicalCertHandler(String address) {
SSLContext ctx = null;
try {
- ctx = SSLContext.getInstance("TLSv1.2");
+ ctx = ProxyConfigurator.getThriftSslContext();
+ // Make copy
+ ctx = SSLContext.getInstance(ctx.getProtocol(), ctx.getProvider());
} catch (NoSuchAlgorithmException e) {
Gui.asyncMessageBox(I18n.GUI.getString("GraphicalCertHandler.Message.error.couldNotGetSSLContext"),
MessageType.ERROR, LOGGER, e);