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
b6f735a8
Commit
b6f735a8
authored
Jan 27, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename module
parent
deae08fc
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
13 additions
and
23 deletions
+13
-23
app
app
+1
-1
build.py
build.py
+3
-3
settings.gradle
settings.gradle
+1
-1
.gitignore
utils/.gitignore
+0
-0
build.gradle
utils/build.gradle
+1
-1
ByteArrayStream.java
utils/src/main/java/com/topjohnwu/utils/ByteArrayStream.java
+1
-1
CryptoUtils.java
utils/src/main/java/com/topjohnwu/utils/CryptoUtils.java
+1
-2
JarMap.java
utils/src/main/java/com/topjohnwu/utils/JarMap.java
+1
-1
SignAPK.java
utils/src/main/java/com/topjohnwu/utils/SignAPK.java
+1
-3
SignBoot.java
utils/src/main/java/com/topjohnwu/utils/SignBoot.java
+1
-1
ZipAdjust.java
utils/src/main/java/com/topjohnwu/utils/ZipAdjust.java
+1
-6
ZipSigner.java
utils/src/main/java/com/topjohnwu/utils/ZipSigner.java
+1
-3
testkey.pk8
utils/src/main/resources/keys/testkey.pk8
+0
-0
testkey.x509.pem
utils/src/main/resources/keys/testkey.x509.pem
+0
-0
No files found.
app
@
b05d2d3a
Subproject commit
19af5f9e0be9e725264d85552fd60f46bffff32d
Subproject commit
b05d2d3a2dc7835d0d074986903a0f633ccc0f15
build.py
View file @
b6f735a8
...
...
@@ -320,11 +320,11 @@ def zip_uninstaller(args):
def
sign_adjust_zip
(
unsigned
,
output
):
signer_name
=
'zipsigner-2.1.jar'
jarsigner
=
os
.
path
.
join
(
'
crypto
'
,
'build'
,
'libs'
,
signer_name
)
jarsigner
=
os
.
path
.
join
(
'
utils
'
,
'build'
,
'libs'
,
signer_name
)
if
not
os
.
path
.
exists
(
jarsigner
):
header
(
'* Building '
+
signer_name
)
proc
=
subprocess
.
run
(
'{}
crypto
:shadowJar'
.
format
(
os
.
path
.
join
(
'.'
,
'gradlew'
)),
shell
=
True
)
proc
=
subprocess
.
run
(
'{}
utils
:shadowJar'
.
format
(
os
.
path
.
join
(
'.'
,
'gradlew'
)),
shell
=
True
)
if
proc
.
returncode
!=
0
:
error
(
'Build {} failed!'
.
format
(
signer_name
))
...
...
@@ -349,7 +349,7 @@ def cleanup(args):
if
'java'
in
args
.
target
:
header
(
'* Cleaning java'
)
subprocess
.
run
(
'{} app:clean snet:clean
crypto
:clean'
.
format
(
os
.
path
.
join
(
'.'
,
'gradlew'
)),
shell
=
True
)
subprocess
.
run
(
'{} app:clean snet:clean
utils
:clean'
.
format
(
os
.
path
.
join
(
'.'
,
'gradlew'
)),
shell
=
True
)
for
f
in
os
.
listdir
(
'out'
):
if
'.apk'
in
f
:
rm
(
os
.
path
.
join
(
'out'
,
f
))
...
...
settings.gradle
View file @
b6f735a8
include
':app'
,
':core'
,
':
crypto
'
,
':snet'
include
':app'
,
':core'
,
':
utils
'
,
':snet'
crypto
/.gitignore
→
utils
/.gitignore
View file @
b6f735a8
File moved
crypto
/build.gradle
→
utils
/build.gradle
View file @
b6f735a8
...
...
@@ -8,7 +8,7 @@ targetCompatibility = "1.8"
jar
{
manifest
{
attributes
'Main-Class'
:
'com.topjohnwu.
crypto
.ZipSigner'
attributes
'Main-Class'
:
'com.topjohnwu.
utils
.ZipSigner'
}
}
...
...
crypto/src/main/java/com/topjohnwu/crypto
/ByteArrayStream.java
→
utils/src/main/java/com/topjohnwu/utils
/ByteArrayStream.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayOutputStream
;
...
...
crypto/src/main/java/com/topjohnwu/crypto
/CryptoUtils.java
→
utils/src/main/java/com/topjohnwu/utils
/CryptoUtils.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
...
...
@@ -22,7 +22,6 @@ import java.security.spec.ECPrivateKeySpec;
import
java.security.spec.ECPublicKeySpec
;
import
java.security.spec.InvalidKeySpecException
;
import
java.security.spec.PKCS8EncodedKeySpec
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
crypto/src/main/java/com/topjohnwu/crypto
/JarMap.java
→
utils/src/main/java/com/topjohnwu/utils
/JarMap.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
java.io.Closeable
;
import
java.io.File
;
...
...
crypto/src/main/java/com/topjohnwu/crypto
/SignAPK.java
→
utils/src/main/java/com/topjohnwu/utils
/SignAPK.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
org.bouncycastle.asn1.ASN1InputStream
;
import
org.bouncycastle.asn1.ASN1ObjectIdentifier
;
...
...
@@ -18,11 +18,9 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import
org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder
;
import
org.bouncycastle.util.encoders.Base64
;
import
java.io.BufferedInputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.FileOutputStream
;
import
java.io.FilterOutputStream
;
...
...
crypto/src/main/java/com/topjohnwu/crypto
/SignBoot.java
→
utils/src/main/java/com/topjohnwu/utils
/SignBoot.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
org.bouncycastle.asn1.ASN1Encodable
;
import
org.bouncycastle.asn1.ASN1EncodableVector
;
...
...
crypto/src/main/java/com/topjohnwu/crypto
/ZipAdjust.java
→
utils/src/main/java/com/topjohnwu/utils
/ZipAdjust.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
java.io.DataOutput
;
import
java.io.DataOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.OutputStream
;
import
java.io.RandomAccessFile
;
import
java.nio.ByteBuffer
;
import
java.nio.ByteOrder
;
import
java.nio.channels.FileChannel
;
import
java.util.Arrays
;
public
class
ZipAdjust
{
...
...
crypto/src/main/java/com/topjohnwu/crypto
/ZipSigner.java
→
utils/src/main/java/com/topjohnwu/utils
/ZipSigner.java
View file @
b6f735a8
package
com
.
topjohnwu
.
crypto
;
package
com
.
topjohnwu
.
utils
;
import
org.bouncycastle.jce.provider.BouncyCastleProvider
;
...
...
@@ -6,9 +6,7 @@ import java.io.BufferedInputStream;
import
java.io.BufferedOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.security.Security
;
...
...
crypto
/src/main/resources/keys/testkey.pk8
→
utils
/src/main/resources/keys/testkey.pk8
View file @
b6f735a8
File moved
crypto
/src/main/resources/keys/testkey.x509.pem
→
utils
/src/main/resources/keys/testkey.x509.pem
View file @
b6f735a8
File moved
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