Support SNI tricks for Android 9+

krlvm · Jul 1, 2020 · d965064 · d965064
1 parent 2a56bbe
commit d965064
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/src/main/java/org/littleshoot/proxy/mitm/CertificateHelper.java b/app/src/main/java/org/littleshoot/proxy/mitm/CertificateHelper.java
@@ -205,6 +205,8 @@
  */
 package org.littleshoot.proxy.mitm;
 
+import android.os.Build;
+
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1Sequence;
@@ -461,10 +463,19 @@ private static X509Certificate signCertificate(
             X509v3CertificateBuilder certificateBuilder,
             PrivateKey signedWithPrivateKey) throws OperatorCreationException,
             CertificateException {
-        ContentSigner signer = new JcaContentSignerBuilder(SIGNATURE_ALGORITHM)
-                .setProvider(PROVIDER_NAME).build(signedWithPrivateKey);
-        return new JcaX509CertificateConverter().setProvider(
-                PROVIDER_NAME).getCertificate(certificateBuilder.build(signer));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            ContentSigner signer = new JcaContentSignerBuilder(SIGNATURE_ALGORITHM)
+                    .build(signedWithPrivateKey);
+            return new JcaX509CertificateConverter()
+                    .getCertificate(certificateBuilder.build(signer));
+        } else {
+            ContentSigner signer = new JcaContentSignerBuilder(SIGNATURE_ALGORITHM)
+                    .setProvider(PROVIDER_NAME)
+                    .build(signedWithPrivateKey);
+            return new JcaX509CertificateConverter()
+                    .setProvider(PROVIDER_NAME)
+                    .getCertificate(certificateBuilder.build(signer));
+        }
     }
 
     public static TrustManager[] getTrustManagers(KeyStore keyStore)

diff --git a/app/src/main/java/org/littleshoot/proxy/mitm/CertificateSniffingMitmManager.java b/app/src/main/java/org/littleshoot/proxy/mitm/CertificateSniffingMitmManager.java
@@ -239,6 +239,7 @@ public CertificateSniffingMitmManager(Authority authority)
             sslEngineSource = new BouncyCastleSslEngineSource(authority, true,
                     true);
         } catch (final Exception e) {
+            e.printStackTrace();
             throw new RootCertificateException(
                     "Errors during assembling root CA.", e);
         }