MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to official BouncyCastle

Browse Source
This commit is contained in:
topjohnwu 2017-07-21 03:56:48 +08:00
parent da4f53ebbb
commit 89e5b8d057
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -55,9 +55,8 @@ dependencies {
implementation 'com.jakewharton:butterknife:8.7.0' implementation 'com.jakewharton:butterknife:8.7.0'
implementation 'com.thoughtbot:expandablerecyclerview:1.4' implementation 'com.thoughtbot:expandablerecyclerview:1.4'
implementation 'us.feras.mdv:markdownview:1.1.0' implementation 'us.feras.mdv:markdownview:1.1.0'
implementation 'com.madgag.spongycastle:core:1.54.0.0' implementation 'org.bouncycastle:bcprov-jdk15on:1.57'
implementation 'com.madgag.spongycastle:prov:1.54.0.0' implementation 'org.bouncycastle:bcpkix-jdk15on:1.57'
implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
implementation 'com.google.android.gms:play-services-safetynet:9.0.1' implementation 'com.google.android.gms:play-services-safetynet:9.0.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
} }

4
app/proguard-rules.pro vendored
View File

@ -16,8 +16,8 @@
# public *; # public *;
#} #}
# SpongyCastle # BouncyCastle
-keep class org.spongycastle.** { *; } -keep class org.bouncycastle.** { *; }
-dontwarn javax.naming.** -dontwarn javax.naming.**
-dontwarn android.content.** -dontwarn android.content.**

36
app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
View File

@ -2,24 +2,24 @@ package com.topjohnwu.magisk.utils;
import android.content.Context; import android.content.Context;
import org.spongycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1InputStream;
import org.spongycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.spongycastle.asn1.DEROutputStream; import org.bouncycastle.asn1.DEROutputStream;
import org.spongycastle.asn1.cms.CMSObjectIdentifiers; import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
import org.spongycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.spongycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.spongycastle.cms.CMSException; import org.bouncycastle.cms.CMSException;
import org.spongycastle.cms.CMSProcessableByteArray; import org.bouncycastle.cms.CMSProcessableByteArray;
import org.spongycastle.cms.CMSSignedData; import org.bouncycastle.cms.CMSSignedData;
import org.spongycastle.cms.CMSSignedDataGenerator; import org.bouncycastle.cms.CMSSignedDataGenerator;
import org.spongycastle.cms.CMSTypedData; import org.bouncycastle.cms.CMSTypedData;
import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
import org.spongycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.spongycastle.operator.ContentSigner; import org.bouncycastle.operator.ContentSigner;
import org.spongycastle.operator.OperatorCreationException; import org.bouncycastle.operator.OperatorCreationException;
import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
import org.spongycastle.util.encoders.Base64; import org.bouncycastle.util.encoders.Base64;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;