Merge pull request #68 from balazsgerlei/display-sha256-signatures

Add SHA-256 signature to App Details screen

Author: MartinStyk

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/page/certificate/AppCertificateDetailsFragmentViewModel.kt

@@ -40,9 +40,14 @@ class AppCertificateDetailsFragmentViewModel @AssistedInject constructor(
             ),
             DetailInfoAdapter.DetailInfo(
                 TextInfo.from(R.string.cert_md5),
-                TextInfo.from(data.certificateHash),
+                TextInfo.from(data.certificateHashMd5),
                 TextInfo.from(R.string.cert_md5_description),
             ),
+            DetailInfoAdapter.DetailInfo(
+                TextInfo.from(R.string.cert_sha256),
+                TextInfo.from(data.certificateHashSha256),
+                TextInfo.from(R.string.cert_sha256_description),
+            ),
             data.issuerName?.let {
                 DetailInfoAdapter.DetailInfo(
                     TextInfo.from(R.string.issuer_name),

app/src/main/res/values-ja/strings.xml

@@ -126,6 +126,7 @@
     <string name="start_date">開始 : </string>
     <string name="end_date">有効期限  : </string>
     <string name="cert_md5">MD5証明書</string>
+    <string name="cert_sha256">SHA-256証明書</string>
     <string name="issuer_name">発行者名</string>
     <string name="issuer_organization">発行組織</string>
     <string name="issuer_country">発行国</string>
@@ -137,6 +138,7 @@
     <string name="start_date_description">証明書の有効期間の開始</string>
     <string name="end_date_description">証明書の有効期間の終了</string>
     <string name="cert_md5_description">証明書のMD5ハッシュ</string>
+    <string name="cert_sha256_description">証明書のSHA-256ハッシュ</string>
     <string name="issuer_name_description">証明書の発行者の名前</string>
     <string name="issuer_organization_description">証明書の組織の名前</string>
     <string name="issuer_country_description">証明書の発行国の名前</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -190,6 +190,7 @@
     <string name="start_date">有效日期</string>
     <string name="end_date">截止日期</string>
     <string name="cert_md5">MD5 憑證</string>
+    <string name="cert_sha256">SHA-256 憑證</string>
     <string name="issuer_name">發行者名稱</string>
     <string name="issuer_organization">發行機構</string>
     <string name="issuer_country">發行國家</string>
@@ -202,6 +203,7 @@
     <string name="start_date_description">憑證生效起始日期。</string>
     <string name="end_date_description">憑證效力截止日期。</string>
     <string name="cert_md5_description">憑證的 MD5 雜湊值。</string>
+    <string name="cert_sha256_description">憑證的 SHA-256 雜湊值。</string>
     <string name="issuer_name_description">憑證發行者名稱。</string>
     <string name="issuer_organization_description">憑證發行機構名稱。</string>
     <string name="issuer_country_description">發行憑證的國家代號。</string>

app/src/main/res/values/strings.xml

@@ -154,6 +154,7 @@
     <string name="start_date">Valid from</string>
     <string name="end_date">Valid to</string>
     <string name="cert_md5">Certificate MD5</string>
+    <string name="cert_sha256">Certificate SHA-256</string>
     <string name="issuer_name">Issuer name</string>
     <string name="issuer_organization">Issuer organization</string>
     <string name="issuer_country">Issuer country</string>
@@ -165,6 +166,7 @@
     <string name="start_date_description">Start of validity period of the certificate.</string>
     <string name="end_date_description">End of validity period of the certificate.</string>
     <string name="cert_md5_description">MD5 hash of the certificate.</string>
+    <string name="cert_sha256_description">SHA-256 hash of the certificate.</string>
     <string name="issuer_name_description">Name of issuer of the certificate</string>
     <string name="issuer_organization_description">Name of organization of issuer of the certificate</string>
     <string name="issuer_country_description">Country of issuer of the certificate</string>

core/app-analysis-core/src/main/java/sk/styk/martin/apkanalyzer/core/appanalysis/CertificateManager.kt

@@ -23,8 +23,10 @@ class CertificateManager @Inject internal constructor(private val digestManager:
 
             CertificateData(
                 signAlgorithm = certificate.sigAlgName,
-                certificateHash = digestManager.md5Digest(certificate.encoded),
+                certificateHashMd5 = digestManager.md5Digest(certificate.encoded),
+                certificateHashSha256 = digestManager.md5Digest(certificate.encoded),
                 publicKeyMd5 = digestManager.md5Digest(digestManager.byteToHexString(certificate.publicKey.encoded)),
+                publicKeySha256 = digestManager.sha256Digest(digestManager.byteToHexString(certificate.publicKey.encoded)),
                 startDate = certificate.notBefore,
                 endDate = certificate.notAfter,
                 serialNumber = certificate.serialNumber.toInt(),

core/app-analysis-core/src/main/java/sk/styk/martin/apkanalyzer/core/appanalysis/model/CertificateData.kt

@@ -10,8 +10,10 @@ import java.util.Date
 @Parcelize
 data class CertificateData(
     val signAlgorithm: String,
-    val certificateHash: String,
+    val certificateHashMd5: String,
+    val certificateHashSha256: String,
     val publicKeyMd5: String,
+    val publicKeySha256: String,
     val startDate: Date,
     val endDate: Date,
     val serialNumber: Int = 0,

core/common/src/main/java/sk/styk/martin/apkanalyzer/core/common/digest/DigestManager.kt

@@ -20,6 +20,18 @@ class DigestManager @Inject constructor() {
         return getHexString(digest.digest())
     }
 
+    fun sha256Digest(input: ByteArray): String {
+        val digest = getDigest("SHA-256")
+        digest.update(input)
+        return getHexString(digest.digest())
+    }
+
+    fun sha256Digest(input: String): String {
+        val digest = getDigest("SHA-256")
+        digest.update(input.toByteArray())
+        return getHexString(digest.digest())
+    }
+
     fun byteToHexString(bArray: ByteArray): String {
         val sb = StringBuilder(bArray.size)
         val var5 = bArray.size