jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(gui): support APK signature v3 (PR #773)

Browse Source
This commit is contained in:
Jan S
2019-11-01 17:31:24 +01:00
committed by skylot
parent bae36f9720
commit cf3e17c4b8
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/build.gradle
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile 'io.reactivex.rxjava2:rxjava:2.2.11'
compile "com.github.akarnokd:rxjava2-swing:0.3.7"
compile 'com.android.tools.build:apksig:3.4.2'
compile 'com.android.tools.build:apksig:3.5.1'
}
application {
jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java
+22 -2
View File
@@ -5,7 +5,8 @@ import java.security.cert.Certificate;
import java.util.List;
import java.util.stream.Collectors;
import javax.swing.*;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.text.StringEscapeUtils;
@@ -83,7 +84,6 @@ public class ApkSignature extends JNode {
final String sigFailKey = "apkSignature.signatureFailed";
writeIssues(builder, err, result.getErrors());
writeIssues(builder, warn, result.getWarnings());
if (!result.getV1SchemeSigners().isEmpty()) {
builder.append("<h2>");
@@ -124,6 +124,26 @@ public class ApkSignature extends JNode {
}
builder.append("</blockquote>");
}
if (!result.getV3SchemeSigners().isEmpty()) {
builder.append("<h2>");
builder.escape(NLS.str(result.isVerifiedUsingV3Scheme() ? sigSuccKey : sigFailKey, 3));
builder.append("</h2>\n");
builder.append("<blockquote>");
for (ApkVerifier.Result.V3SchemeSignerInfo signer : result.getV3SchemeSigners()) {
builder.append("<h3>");
builder.escape(NLS.str("apkSignature.signer"));
builder.append(" ");
builder.append(Integer.toString(signer.getIndex() + 1));
builder.append("</h3>");
writeCertificate(builder, signer.getCertificate());
writeIssues(builder, err, signer.getErrors());
writeIssues(builder, warn, signer.getWarnings());
}
builder.append("</blockquote>");
}
writeIssues(builder, warn, result.getWarnings());
this.content = builder.toString();
} catch (Exception e) {
LOG.error(e.getMessage(), e);