From ae8341cf1f563fbcf2bdd6a4eff9525f42e9e995 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 10 Jan 2018 17:14:45 +0100
Subject: 8773 more test cases and clean-up

---
 .../java/se/leap/bitmaskclient/ConfigHelper.java   | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
index 54bcc1f4..0e861059 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java
@@ -47,7 +47,7 @@ import java.security.spec.PKCS8EncodedKeySpec;
 import static android.R.attr.name;
 
 /**
- * Stores constants, and implements auxiliary methods used across all LEAP Android classes.
+ * Stores constants, and implements auxiliary methods used across all Bitmask Android classes.
  *
  * @author parmegv
  * @author MeanderingCode
@@ -172,25 +172,30 @@ public class ConfigHelper {
         return key;
     }
 
-    public static String base64toHex(String base64_input) {
-        byte[] byteArray = Base64.decode(base64_input);
-        int readBytes = byteArray.length;
+    private static String byteArrayToHex(byte[] input) {
+        int readBytes = input.length;
         StringBuffer hexData = new StringBuffer();
         int onebyte;
         for (int i = 0; i < readBytes; i++) {
-            onebyte = ((0x000000ff & byteArray[i]) | 0xffffff00);
+            onebyte = ((0x000000ff & input[i]) | 0xffffff00);
             hexData.append(Integer.toHexString(onebyte).substring(6));
         }
         return hexData.toString();
     }
 
+    /**
+     * Calculates the hexadecimal representation of a sha256/sha1 fingerprint of a certificate
+     *
+     * @param certificate
+     * @param encoding
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws CertificateEncodingException
+     */
     @NonNull
     public static String getFingerprintFromCertificate(X509Certificate certificate, String encoding) throws NoSuchAlgorithmException, CertificateEncodingException /*, UnsupportedEncodingException*/ {
-        return base64toHex(
-                //new String(Base64.encode(MessageDigest.getInstance(encoding).digest(certificate.getEncoded())), "US-ASCII"));
-                android.util.Base64.encodeToString(
-                MessageDigest.getInstance(encoding).digest(certificate.getEncoded()),
-                android.util.Base64.DEFAULT));
+        byte[] byteArray = MessageDigest.getInstance(encoding).digest(certificate.getEncoded());
+        return byteArrayToHex(byteArray);
     }
     
     /**
-- 
cgit v1.2.3