diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-05-30 11:22:19 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-07-22 10:41:48 +0200 |
| commit | 9d994ba5eaa0f92ecaa6ff95d0b133307312fc8f (patch) | |
| tree | 3a87948185f0c5b49c27941adc2d8f2d3ba5455a /src | |
| parent | b9fd95f4767552305d39b5f4b595a3afdb3115db (diff) | |
| download | strongswan-9d994ba5eaa0f92ecaa6ff95d0b133307312fc8f.tar.bz2 strongswan-9d994ba5eaa0f92ecaa6ff95d0b133307312fc8f.tar.xz | |
android: Remove unused hash argument from getTrustedCertificates()
Diffstat (limited to 'src')
| -rw-r--r-- | src/frontends/android/jni/libandroidbridge/charonservice.c | 4 | ||||
| -rw-r--r-- | src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java | 27 |
2 files changed, 6 insertions, 25 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c index 707bb3df0..32bf28f09 100644 --- a/src/frontends/android/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/jni/libandroidbridge/charonservice.c @@ -299,12 +299,12 @@ METHOD(charonservice_t, get_trusted_certificates, linked_list_t*, method_id = (*env)->GetMethodID(env, android_charonvpnservice_class, - "getTrustedCertificates", "(Ljava/lang/String;)[[B"); + "getTrustedCertificates", "()[[B"); if (!method_id) { goto failed; } - jcerts = (*env)->CallObjectMethod(env, this->vpn_service, method_id, NULL); + jcerts = (*env)->CallObjectMethod(env, this->vpn_service, method_id); if (!jcerts || androidjni_exception_occurred(env)) { goto failed; diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java index e45a7d9bd..31172ab44 100644 --- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java @@ -419,49 +419,30 @@ public class CharonVpnService extends VpnService implements Runnable * Function called via JNI to generate a list of DER encoded CA certificates * as byte array. * - * @param hash optional alias (only hash part), if given matching certificates are returned * @return a list of DER encoded CA certificates */ - private byte[][] getTrustedCertificates(String hash) + private byte[][] getTrustedCertificates() { ArrayList<byte[]> certs = new ArrayList<byte[]>(); TrustedCertificateManager certman = TrustedCertificateManager.getInstance(); try { - if (hash != null) + String alias = this.mCurrentCertificateAlias; + if (alias != null) { - String alias = "user:" + hash + ".0"; X509Certificate cert = certman.getCACertificateFromAlias(alias); if (cert == null) { - alias = "system:" + hash + ".0"; - cert = certman.getCACertificateFromAlias(alias); - } - if (cert == null) - { return null; } certs.add(cert.getEncoded()); } else { - String alias = this.mCurrentCertificateAlias; - if (alias != null) + for (X509Certificate cert : certman.getAllCACertificates().values()) { - X509Certificate cert = certman.getCACertificateFromAlias(alias); - if (cert == null) - { - return null; - } certs.add(cert.getEncoded()); } - else - { - for (X509Certificate cert : certman.getAllCACertificates().values()) - { - certs.add(cert.getEncoded()); - } - } } } catch (CertificateEncodingException e) |