Merge "Change OkHttp test infrastructure to not use BC provider" am: 157721cd6c am: b546444591

am: 91625677b3

Change-Id: Ida53271e3ab3f80a8108b4f3eac1063ccda0cfde

1 files changed, 4 insertions, 2 deletions

diff --git a/mockwebserver/src/main/java/com/squareup/okhttp/internal/HeldCertificate.java b/mockwebserver/src/main/java/com/squareup/okhttp/internal/HeldCertificate.java
index 2fff99c..8fb7e8a 100644
--- a/mockwebserver/src/main/java/com/squareup/okhttp/internal/HeldCertificate.java
+++ b/mockwebserver/src/main/java/com/squareup/okhttp/internal/HeldCertificate.java
@@ -129,13 +129,15 @@ public final class HeldCertificate {
             new BasicConstraints(maxIntermediateCas));
       }
 
+      // Android-changed: Use AndroidOpenSSL provider instead of BC.
       X509Certificate certificate = generator.generateX509Certificate(
-          signedByKeyPair.getPrivate(), "BC");
+          signedByKeyPair.getPrivate(), "AndroidOpenSSL");
       return new HeldCertificate(certificate, heldKeyPair);
     }
 
     public KeyPair generateKeyPair() throws GeneralSecurityException {
-      KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
+      // Android-changed: Don't specify provider for KeyPairGenerator instance.
+      KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
       keyPairGenerator.initialize(1024, new SecureRandom());
       return keyPairGenerator.generateKeyPair();
     }