Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
89e5b8d0
Commit
89e5b8d0
authored
Jul 20, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to official BouncyCastle
parent
da4f53eb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
23 deletions
+22
-23
build.gradle
app/build.gradle
+2
-3
proguard-rules.pro
app/proguard-rules.pro
+2
-2
ZipUtils.java
app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
+18
-18
No files found.
app/build.gradle
View file @
89e5b8d0
...
...
@@ -55,9 +55,8 @@ dependencies {
implementation
'com.jakewharton:butterknife:8.7.0'
implementation
'com.thoughtbot:expandablerecyclerview:1.4'
implementation
'us.feras.mdv:markdownview:1.1.0'
implementation
'com.madgag.spongycastle:core:1.54.0.0'
implementation
'com.madgag.spongycastle:prov:1.54.0.0'
implementation
'com.madgag.spongycastle:pkix:1.54.0.0'
implementation
'org.bouncycastle:bcprov-jdk15on:1.57'
implementation
'org.bouncycastle:bcpkix-jdk15on:1.57'
implementation
'com.google.android.gms:play-services-safetynet:9.0.1'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.7.0'
}
app/proguard-rules.pro
View file @
89e5b8d0
...
...
@@ -16,8 +16,8 @@
# public *;
#}
#
Spong
yCastle
-
keep
class
org
.
spong
ycastle
.
**
{
*
;
}
#
Bounc
yCastle
-
keep
class
org
.
bounc
ycastle
.
**
{
*
;
}
-
dontwarn
javax
.
naming
.
**
-
dontwarn
android
.
content
.
**
...
...
app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
View file @
89e5b8d0
...
...
@@ -2,24 +2,24 @@ package com.topjohnwu.magisk.utils;
import
android.content.Context
;
import
org.
spong
ycastle.asn1.ASN1InputStream
;
import
org.
spong
ycastle.asn1.ASN1ObjectIdentifier
;
import
org.
spong
ycastle.asn1.DEROutputStream
;
import
org.
spong
ycastle.asn1.cms.CMSObjectIdentifiers
;
import
org.
spong
ycastle.asn1.pkcs.PrivateKeyInfo
;
import
org.
spong
ycastle.cert.jcajce.JcaCertStore
;
import
org.
spong
ycastle.cms.CMSException
;
import
org.
spong
ycastle.cms.CMSProcessableByteArray
;
import
org.
spong
ycastle.cms.CMSSignedData
;
import
org.
spong
ycastle.cms.CMSSignedDataGenerator
;
import
org.
spong
ycastle.cms.CMSTypedData
;
import
org.
spong
ycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder
;
import
org.
spong
ycastle.jce.provider.BouncyCastleProvider
;
import
org.
spong
ycastle.operator.ContentSigner
;
import
org.
spong
ycastle.operator.OperatorCreationException
;
import
org.
spong
ycastle.operator.jcajce.JcaContentSignerBuilder
;
import
org.
spong
ycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder
;
import
org.
spong
ycastle.util.encoders.Base64
;
import
org.
bounc
ycastle.asn1.ASN1InputStream
;
import
org.
bounc
ycastle.asn1.ASN1ObjectIdentifier
;
import
org.
bounc
ycastle.asn1.DEROutputStream
;
import
org.
bounc
ycastle.asn1.cms.CMSObjectIdentifiers
;
import
org.
bounc
ycastle.asn1.pkcs.PrivateKeyInfo
;
import
org.
bounc
ycastle.cert.jcajce.JcaCertStore
;
import
org.
bounc
ycastle.cms.CMSException
;
import
org.
bounc
ycastle.cms.CMSProcessableByteArray
;
import
org.
bounc
ycastle.cms.CMSSignedData
;
import
org.
bounc
ycastle.cms.CMSSignedDataGenerator
;
import
org.
bounc
ycastle.cms.CMSTypedData
;
import
org.
bounc
ycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder
;
import
org.
bounc
ycastle.jce.provider.BouncyCastleProvider
;
import
org.
bounc
ycastle.operator.ContentSigner
;
import
org.
bounc
ycastle.operator.OperatorCreationException
;
import
org.
bounc
ycastle.operator.jcajce.JcaContentSignerBuilder
;
import
org.
bounc
ycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder
;
import
org.
bounc
ycastle.util.encoders.Base64
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment