Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indenting fixes

Browse Source
This commit is contained in:
Daniel Martí 2014-01-08 23:23:32 +01:00
parent 254327f9a7
commit 30140d7a3b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/fdroid/fdroid/FDroidApp.java
View File

@ -139,19 +139,19 @@ public class FDroidApp extends Application {
try { try {
SSLContext sc = SSLContext.getInstance("TLS"); SSLContext sc = SSLContext.getInstance("TLS");
X509TrustManager defaultTrustManager = null; X509TrustManager defaultTrustManager = null;
/* /*
* init a trust manager factory with a null keystore to access the system trust managers * init a trust manager factory with a null keystore to access the system trust managers
*/ */
TrustManagerFactory tmf = TrustManagerFactory tmf =
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
KeyStore ks = null; KeyStore ks = null;
tmf.init(ks); tmf.init(ks);
TrustManager[] mgrs = tmf.getTrustManagers(); TrustManager[] mgrs = tmf.getTrustManagers();
if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager) if(mgrs.length > 0 && mgrs[0] instanceof X509TrustManager)
defaultTrustManager = (X509TrustManager) mgrs[0]; defaultTrustManager = (X509TrustManager) mgrs[0];
/* /*
* compose a chain of trust managers as follows: * compose a chain of trust managers as follows:
@ -173,7 +173,7 @@ public class FDroidApp extends Application {
Log.e("FDroid", "Unable to set up trust manager chain. NoSuchAlgorithmException"); Log.e("FDroid", "Unable to set up trust manager chain. NoSuchAlgorithmException");
} catch (KeyStoreException e) { } catch (KeyStoreException e) {
Log.e("FDroid", "Unable to set up trust manager chain. KeyStoreException"); Log.e("FDroid", "Unable to set up trust manager chain. KeyStoreException");
} }
} }
private Context ctx; private Context ctx;

18
src/org/fdroid/fdroid/FDroidCertPins.java
View File

@ -24,21 +24,21 @@ import java.util.Arrays;
public class FDroidCertPins { public class FDroidCertPins {
public static final String[] DEFAULT_PINS = public static final String[] DEFAULT_PINS =
{ {
/* /*
* SubjectDN: CN=f-droid.org, OU=PositiveSSL, OU=Domain Control Validated * SubjectDN: CN=f-droid.org, OU=PositiveSSL, OU=Domain Control Validated
* IssuerDN: CN=PositiveSSL CA 2, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB * IssuerDN: CN=PositiveSSL CA 2, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
* Fingerprint: 84B91CDF2312CB9BA7F3BE803783302F8D8C299F * Fingerprint: 84B91CDF2312CB9BA7F3BE803783302F8D8C299F
* SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A * SPKI Pin: 638F93856E1F5EDFCBD40C46D4160CFF21B0713A
*/ */
"638F93856E1F5EDFCBD40C46D4160CFF21B0713A", "638F93856E1F5EDFCBD40C46D4160CFF21B0713A",
/* /*
* SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated * SubjectDN: CN=guardianproject.info, OU=Gandi Standard SSL, OU=Domain Control Validated
* IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR * IssuerDN: CN=Gandi Standard SSL CA, O=GANDI SAS, C=FR
* Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828 * Fingerprint: 187C2573E924DFCBFF2A781A2F99D71C6E031828
* SPKI Pin: EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4 * SPKI Pin: EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4
*/ */
"EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4", "EB6BBC6C6BAEEA20CB0F3357720D86E0F3A526F4",
}; };
public static ArrayList<String> PINLIST = null; public static ArrayList<String> PINLIST = null;