|
@@ -47,6 +47,7 @@ import java.security.cert.TrustAnchor;
|
47
|
47
|
import java.security.cert.X509Certificate;
|
48
|
48
|
import java.util.ArrayList;
|
49
|
49
|
import java.util.Arrays;
|
|
50
|
+import java.util.Base64;
|
50
|
51
|
import java.util.Collection;
|
51
|
52
|
import java.util.HashMap;
|
52
|
53
|
import java.util.HashSet;
|
|
@@ -63,8 +64,6 @@ import javax.net.ssl.KeyManager;
|
63
|
64
|
import javax.net.ssl.KeyManagerFactory;
|
64
|
65
|
import javax.net.ssl.X509TrustManager;
|
65
|
66
|
|
66
|
|
-import com.migcomponents.migbase64.Base64;
|
67
|
|
-
|
68
|
67
|
/**
|
69
|
68
|
* Manages storage and validation of certificates used when connecting to SSL servers.
|
70
|
69
|
*
|
|
@@ -200,7 +199,7 @@ public class CertificateManager implements X509TrustManager {
|
200
|
199
|
*/
|
201
|
200
|
public TrustResult isTrusted(final X509Certificate certificate) {
|
202
|
201
|
try {
|
203
|
|
- final String sig = Base64.encodeToString(certificate.getSignature(), false);
|
|
202
|
+ final String sig = Base64.getEncoder().encodeToString(certificate.getSignature());
|
204
|
203
|
|
205
|
204
|
if (config.hasOptionString("ssl", "trusted") && config.getOptionList("ssl",
|
206
|
205
|
"trusted").contains(sig)) {
|
|
@@ -351,7 +350,7 @@ public class CertificateManager implements X509TrustManager {
|
351
|
350
|
case IGNORE_PERMANENTLY:
|
352
|
351
|
final List<String> list = new ArrayList<>(config
|
353
|
352
|
.getOptionList("ssl", "trusted"));
|
354
|
|
- list.add(Base64.encodeToString(chain[0].getSignature(), false));
|
|
353
|
+ list.add(Base64.getEncoder().encodeToString(chain[0].getSignature()));
|
355
|
354
|
userSettings.setOption("ssl", "trusted", list);
|
356
|
355
|
break;
|
357
|
356
|
case IGNORE_TEMPORARILY:
|