mirror of
https://github.com/M66B/FairEmail.git
synced 2026-04-01 22:56:33 +02:00
Added optional BC JSSE provider
This commit is contained in:
@@ -124,6 +124,7 @@ import com.sun.mail.util.MailConnectException;
|
||||
import net.openid.appauth.AuthState;
|
||||
import net.openid.appauth.TokenResponse;
|
||||
|
||||
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
@@ -3613,67 +3614,73 @@ public class Log {
|
||||
static SpannableStringBuilder getCiphers() {
|
||||
SpannableStringBuilder ssb = new SpannableStringBuilderEx();
|
||||
|
||||
for (String protocol : new String[]{"SSL", "TLS"})
|
||||
try {
|
||||
int begin = ssb.length();
|
||||
ssb.append("Protocol: ").append(protocol);
|
||||
ssb.setSpan(new StyleSpan(Typeface.BOLD), begin, ssb.length(), 0);
|
||||
ssb.append("\r\n\r\n");
|
||||
for (Provider provider : new Provider[]{null, new BouncyCastleJsseProvider()})
|
||||
for (String protocol : new String[]{"SSL", "TLS"})
|
||||
try {
|
||||
int begin = ssb.length();
|
||||
ssb.append("Protocol: ").append(protocol)
|
||||
.append(" ")
|
||||
.append(provider == null ? "Android" : provider.getClass().getSimpleName());
|
||||
ssb.setSpan(new StyleSpan(Typeface.BOLD), begin, ssb.length(), 0);
|
||||
ssb.append("\r\n\r\n");
|
||||
|
||||
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
|
||||
tmf.init((KeyStore) null);
|
||||
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
|
||||
tmf.init((KeyStore) null);
|
||||
|
||||
ssb.append("Provider: ").append(tmf.getProvider().getName()).append("\r\n");
|
||||
ssb.append("Algorithm: ").append(tmf.getAlgorithm()).append("\r\n");
|
||||
ssb.append("Provider: ").append(tmf.getProvider().getName()).append("\r\n");
|
||||
ssb.append("Algorithm: ").append(tmf.getAlgorithm()).append("\r\n");
|
||||
|
||||
TrustManager[] tms = tmf.getTrustManagers();
|
||||
if (tms != null)
|
||||
for (TrustManager tm : tms)
|
||||
ssb.append("Manager: ").append(tm.getClass().getName()).append("\r\n");
|
||||
TrustManager[] tms = tmf.getTrustManagers();
|
||||
if (tms != null)
|
||||
for (TrustManager tm : tms)
|
||||
ssb.append("Manager: ").append(tm.getClass().getName()).append("\r\n");
|
||||
|
||||
SSLContext sslContext = SSLContext.getInstance(protocol);
|
||||
SSLContext sslContext = (provider == null
|
||||
? SSLContext.getInstance(protocol)
|
||||
: SSLContext.getInstance(protocol, provider));
|
||||
|
||||
ssb.append("Context: ").append(sslContext.getProtocol()).append("\r\n\r\n");
|
||||
|
||||
sslContext.init(null, tmf.getTrustManagers(), null);
|
||||
SSLSocket socket = (SSLSocket) sslContext.getSocketFactory().createSocket();
|
||||
ssb.append("Context: ").append(sslContext.getProtocol()).append("\r\n\r\n");
|
||||
|
||||
List<String> protocols = new ArrayList<>();
|
||||
protocols.addAll(Arrays.asList(socket.getEnabledProtocols()));
|
||||
sslContext.init(null, tmf.getTrustManagers(), null);
|
||||
SSLSocket socket = (SSLSocket) sslContext.getSocketFactory().createSocket();
|
||||
|
||||
for (String p : socket.getSupportedProtocols()) {
|
||||
boolean enabled = protocols.contains(p);
|
||||
if (!enabled)
|
||||
ssb.append('(');
|
||||
int start = ssb.length();
|
||||
ssb.append(p);
|
||||
if (!enabled) {
|
||||
ssb.setSpan(new StrikethroughSpan(), start, ssb.length(), 0);
|
||||
ssb.append(')');
|
||||
List<String> protocols = new ArrayList<>();
|
||||
protocols.addAll(Arrays.asList(socket.getEnabledProtocols()));
|
||||
|
||||
for (String p : socket.getSupportedProtocols()) {
|
||||
boolean enabled = protocols.contains(p);
|
||||
if (!enabled)
|
||||
ssb.append('(');
|
||||
int start = ssb.length();
|
||||
ssb.append(p);
|
||||
if (!enabled) {
|
||||
ssb.setSpan(new StrikethroughSpan(), start, ssb.length(), 0);
|
||||
ssb.append(')');
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
|
||||
List<String> ciphers = new ArrayList<>();
|
||||
ciphers.addAll(Arrays.asList(socket.getEnabledCipherSuites()));
|
||||
List<String> ciphers = new ArrayList<>();
|
||||
ciphers.addAll(Arrays.asList(socket.getEnabledCipherSuites()));
|
||||
|
||||
for (String c : socket.getSupportedCipherSuites()) {
|
||||
boolean enabled = ciphers.contains(c);
|
||||
if (!enabled)
|
||||
ssb.append('(');
|
||||
int start = ssb.length();
|
||||
ssb.append(c);
|
||||
if (!enabled) {
|
||||
ssb.setSpan(new StrikethroughSpan(), start, ssb.length(), 0);
|
||||
ssb.append(')');
|
||||
for (String c : socket.getSupportedCipherSuites()) {
|
||||
boolean enabled = ciphers.contains(c);
|
||||
if (!enabled)
|
||||
ssb.append('(');
|
||||
int start = ssb.length();
|
||||
ssb.append(c);
|
||||
if (!enabled) {
|
||||
ssb.setSpan(new StrikethroughSpan(), start, ssb.length(), 0);
|
||||
ssb.append(')');
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
} catch (Throwable ex) {
|
||||
ssb.append(ex.toString());
|
||||
}
|
||||
ssb.append("\r\n");
|
||||
} catch (Throwable ex) {
|
||||
ssb.append(ex.toString());
|
||||
}
|
||||
|
||||
ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), 0, ssb.length(), 0);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user