moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-25 14:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rethrow the original validation error if the cert isn't pinned or self-signed

Browse Source
This commit is contained in:
Cameron Gutman 2020-06-29 11:29:33 -07:00
parent 536496184e
commit 2329b41bce
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/limelight/nvstream/http/NvHTTP.java
View File

@ -92,8 +92,15 @@ public class NvHTTP {
defaultTrustManager.checkServerTrusted(certs, authType);
} catch (CertificateException e) {
// Check the server certificate if we've paired to this host
if (certs.length != 1 || !certs[0].equals(NvHTTP.this.serverCert)) {
throw new CertificateException("Certificate mismatch");
if (certs.length == 1 && NvHTTP.this.serverCert != null) {
if (!certs[0].equals(NvHTTP.this.serverCert)) {
throw new CertificateException("Certificate mismatch");
}
}
else {
// The cert chain doesn't look like a self-signed cert or we don't have
// a certificate pinned, so re-throw the original validation error.
throw e;
}
}
}