android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-12-25 00:01:02 +03:00
Code Releases Activity

Fixes for bouncycastle tests

Browse Source
This commit is contained in:
Yuri Schimke
2020-01-20 22:47:13 +00:00
parent bf4c70a0bc
commit 005c39b592
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp-testing-support/src/main/java/okhttp3/testing/PlatformRule.kt
View File

@@ -193,6 +193,8 @@ open class PlatformRule @JvmOverloads constructor(
fun isJdk8Alpn() = getPlatformSystemProperty() == JDK8_ALPN_PROPERTY
fun isBouncyCastle() = getPlatformSystemProperty() == BOUNCYCASTLE_PROPERTY
fun hasHttp2Support() = !isJdk8()
fun assumeConscrypt() {

4
okhttp-tls/src/test/java/okhttp3/tls/HandshakeCertificatesTest.java
View File

@@ -142,11 +142,11 @@ public final class HandshakeCertificatesTest {
.build();
X509Certificate[] acceptedIssuers = handshakeCertificates.trustManager().getAcceptedIssuers();
Set<String> names = Arrays.stream(acceptedIssuers)
.map(cert -> cert.getSubjectDN().getName().split("[ ,]")[0])
.map(cert -> cert.getSubjectDN().getName())
.collect(Collectors.toCollection(LinkedHashSet::new));
// It's safe to assume all platforms will have a major Internet certificate issuer.
assertThat(names).contains("CN=Entrust");
assertThat(names).anyMatch(s -> s.matches("[A-Z]+=Entrust.*"));
}
private InetSocketAddress startTlsServer() throws IOException {

13
okhttp-tls/src/test/java/okhttp3/tls/HeldCertificateTest.java
View File

@@ -256,10 +256,21 @@ public final class HeldCertificateTest {
+ "MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCA7ODT0xhGSNn4ESj6J\n"
+ "lu/GJQZoU9lDrCPeUcQ28tzOWw==\n"
+ "-----END PRIVATE KEY-----\n";
String bcPkcs8Pem = ""
+ "-----BEGIN PRIVATE KEY-----\n"
+ "ME0CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEMzAxAgEBBCA7ODT0xhGSNn4ESj6J\n"
+ "lu/GJQZoU9lDrCPeUcQ28tzOW6AKBggqhkjOPQMBBw==\n"
+ "-----END PRIVATE KEY-----\n";
HeldCertificate heldCertificate = HeldCertificate.decode(certificatePem + pkcs8Pem);
assertThat(heldCertificate.certificatePem()).isEqualTo(certificatePem);
assertThat(heldCertificate.privateKeyPkcs8Pem()).isEqualTo(pkcs8Pem);
// Slightly different encoding
if (platform.isBouncyCastle()) {
assertThat(heldCertificate.privateKeyPkcs8Pem()).isEqualTo(bcPkcs8Pem);
} else {
assertThat(heldCertificate.privateKeyPkcs8Pem()).isEqualTo(pkcs8Pem);
}
X509Certificate certificate = heldCertificate.certificate();
assertThat(certificate.getNotBefore().getTime()).isEqualTo(5_000L);