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
97a691ce
Commit
97a691ce
authored
Oct 24, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve keygen for signing repackaged manager
parent
9d948f2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
11 deletions
+16
-11
Keygen.kt
app/src/main/java/com/topjohnwu/magisk/utils/Keygen.kt
+12
-9
PatchAPK.kt
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
+4
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/utils/Keygen.kt
View file @
97a691ce
...
...
@@ -33,10 +33,14 @@ private interface CertKeyProvider {
}
@Suppress
(
"DEPRECATION"
)
object
Keygen
:
CertKeyProvider
{
private
const
val
ALIAS
=
"magisk"
private
val
PASSWORD
=
"magisk"
.
toCharArray
()
private
const
val
TESTKEY_CERT
=
"61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
class
Keygen
:
CertKeyProvider
{
companion
object
{
private
const
val
ALIAS
=
"magisk"
private
val
PASSWORD
=
"magisk"
.
toCharArray
()
private
const
val
TESTKEY_CERT
=
"61ed377e85d386a8dfee6b864bd85b0bfaa5af81"
private
const
val
DNAME
=
"CN=Android, OU=Android, O=Google Inc., L=Mountain View, ST=California, C=US"
}
private
val
start
get
()
=
Calendar
.
getInstance
()
private
val
end
get
()
=
Calendar
.
getInstance
().
apply
{
...
...
@@ -48,7 +52,7 @@ object Keygen: CertKeyProvider {
private
val
provider
:
CertKeyProvider
class
KeyStoreProvider
:
CertKeyProvider
{
inner
class
KeyStoreProvider
:
CertKeyProvider
{
private
val
ks
by
lazy
{
init
()
}
override
val
cert
by
lazy
{
ks
.
getCertificate
(
ALIAS
)
as
X509Certificate
}
override
val
key
by
lazy
{
ks
.
getKey
(
ALIAS
,
PASSWORD
)
as
PrivateKey
}
...
...
@@ -113,9 +117,9 @@ object Keygen: CertKeyProvider {
// Generate new private key and certificate
val
kp
=
KeyPairGenerator
.
getInstance
(
"RSA"
).
apply
{
initialize
(
2048
)
}.
genKeyPair
()
val
dn
=
X500Name
(
"CN=Magisk"
)
val
builder
=
JcaX509v3CertificateBuilder
(
dn
,
BigInteger
.
valueOf
(
start
.
timeInMillis
),
start
.
time
,
end
.
time
,
dn
,
kp
.
public
)
val
dn
ame
=
X500Name
(
DNAME
)
val
builder
=
JcaX509v3CertificateBuilder
(
dn
ame
,
BigInteger
.
valueOf
(
start
.
timeInMillis
),
start
.
time
,
end
.
time
,
dn
ame
,
kp
.
public
)
val
signer
=
JcaContentSignerBuilder
(
"SHA256WithRSA"
).
build
(
kp
.
private
)
val
cert
=
JcaX509CertificateConverter
().
getCertificate
(
builder
.
build
(
signer
))
...
...
@@ -129,5 +133,4 @@ object Keygen: CertKeyProvider {
return
ks
}
}
app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
View file @
97a691ce
...
...
@@ -94,9 +94,10 @@ object PatchAPK {
context
.
packageCodePath
}
// Generate a new
app with random package nam
e
// Generate a new
random package name and signatur
e
val
repack
=
File
(
context
.
cacheDir
,
"patched.apk"
)
val
pkg
=
genPackageName
(
"com."
,
BuildConfig
.
APPLICATION_ID
.
length
)
Config
.
keyStoreRaw
=
""
if
(!
patch
(
src
,
repack
.
path
,
pkg
,
label
))
return
false
...
...
@@ -127,7 +128,8 @@ object PatchAPK {
// Write apk changes
jar
.
getOutputStream
(
je
).
write
(
xml
)
SignAPK
.
sign
(
Keygen
.
cert
,
Keygen
.
key
,
jar
,
FileOutputStream
(
out
).
buffered
())
val
keys
=
Keygen
()
SignAPK
.
sign
(
keys
.
cert
,
keys
.
key
,
jar
,
FileOutputStream
(
out
).
buffered
())
}
catch
(
e
:
Exception
)
{
Timber
.
e
(
e
)
return
false
...
...
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