wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #354 from schaal/check-defaultTrustManager-first

Browse source 
First try defaultTrustManager, then appTrustManager
This commit is contained in:
David-Development 2015-06-21 11:15:39 +02:00
commit 4fd796504e
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java
View file

@ -275,29 +275,28 @@ public class MemorizingTrustManager implements X509TrustManager {
{
Log.d(TAG, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
try {
Log.d(TAG, "checkCertTrusted: trying appTrustManager");
Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
if (isServer)
appTrustManager.checkServerTrusted(chain, authType);
defaultTrustManager.checkServerTrusted(chain, authType);
else
appTrustManager.checkClientTrusted(chain, authType);
defaultTrustManager.checkClientTrusted(chain, authType);
} catch (CertificateException ae) {
// if the cert is stored in our appTrustManager, we ignore expiredness
ae.printStackTrace();
if (isExpiredException(ae)) {
Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
return;
}
if (isCertKnown(chain[0])) {
Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
return;
}
try {
Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
Log.d(TAG, "checkCertTrusted: trying appTrustManager");
if (isServer)
defaultTrustManager.checkServerTrusted(chain, authType);
appTrustManager.checkServerTrusted(chain, authType);
else
defaultTrustManager.checkClientTrusted(chain, authType);
appTrustManager.checkClientTrusted(chain, authType);
} catch (CertificateException e) {
// if the cert is stored in our appTrustManager, we ignore expiredness
if (isExpiredException(e)) {
Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
return;
}
if (isCertKnown(chain[0])) {
Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
return;
}
e.printStackTrace();
interact(chain, authType, e);
}