Snap for 4399706 from 2497dff2034f5930e2b2516a0caf434146995718 to pi-release
Change-Id: I2a69807a12ce9eed5580706c592e5a93670b58c7
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 @@
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();
}