From 9e939131b7e054054aa78fb30634cb6b489d1ae9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 26 Aug 2015 22:42:12 +0200 Subject: [PATCH] Utils.calcFingerprint() should always return null if given null #334 https://gitlab.com/fdroid/fdroidclient/issues/334 --- F-Droid/src/org/fdroid/fdroid/Utils.java | 4 ++++ F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java index cde1f8a8b..e2bc69ab3 100644 --- a/F-Droid/src/org/fdroid/fdroid/Utils.java +++ b/F-Droid/src/org/fdroid/fdroid/Utils.java @@ -339,6 +339,8 @@ public final class Utils { } public static String calcFingerprint(Certificate cert) { + if (cert == null) + return null; try { return calcFingerprint(cert.getEncoded()); } catch (CertificateEncodingException e) { @@ -347,6 +349,8 @@ public final class Utils { } public static String calcFingerprint(byte[] key) { + if (key == null) + return null; String ret = null; if (key.length < 256) { Log.e(TAG, "key was shorter than 256 bytes (" + key.length + "), cannot be valid!"); diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 7fa094999..398e65d59 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -123,10 +123,6 @@ public class WifiStateChangeService extends Service { // the fingerprint for the local repo's signing key LocalRepoKeyStore localRepoKeyStore = LocalRepoKeyStore.get(context); Certificate localCert = localRepoKeyStore.getCertificate(); - // We were not able to generate/get a certificate - if (localCert == null) { - return null; - } FDroidApp.repo.fingerprint = Utils.calcFingerprint(localCert); /*