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
085ea6d0
Commit
085ea6d0
authored
Jul 04, 2019
by
osm0sis
Committed by
John Wu
Jul 04, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SignBoot: use verity keys not testkey to correctly follow AOSP
parent
aaf88b18
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
2 deletions
+26
-2
SignBoot.java
signing/src/main/java/com/topjohnwu/signing/SignBoot.java
+2
-2
verity.pk8
signing/src/main/resources/keys/verity.pk8
+0
-0
verity.x509.pem
signing/src/main/resources/keys/verity.x509.pem
+24
-0
No files found.
signing/src/main/java/com/topjohnwu/signing/SignBoot.java
View file @
085ea6d0
...
@@ -87,12 +87,12 @@ public class SignBoot {
...
@@ -87,12 +87,12 @@ public class SignBoot {
in
.
unread
(
hdr
);
in
.
unread
(
hdr
);
BootSignature
bootsig
=
new
BootSignature
(
target
,
signableSize
);
BootSignature
bootsig
=
new
BootSignature
(
target
,
signableSize
);
if
(
cert
==
null
)
{
if
(
cert
==
null
)
{
cert
=
SignBoot
.
class
.
getResourceAsStream
(
"/keys/
testke
y.x509.pem"
);
cert
=
SignBoot
.
class
.
getResourceAsStream
(
"/keys/
verit
y.x509.pem"
);
}
}
X509Certificate
certificate
=
CryptoUtils
.
readCertificate
(
cert
);
X509Certificate
certificate
=
CryptoUtils
.
readCertificate
(
cert
);
bootsig
.
setCertificate
(
certificate
);
bootsig
.
setCertificate
(
certificate
);
if
(
key
==
null
)
{
if
(
key
==
null
)
{
key
=
SignBoot
.
class
.
getResourceAsStream
(
"/keys/
testke
y.pk8"
);
key
=
SignBoot
.
class
.
getResourceAsStream
(
"/keys/
verit
y.pk8"
);
}
}
PrivateKey
privateKey
=
CryptoUtils
.
readPrivateKey
(
key
);
PrivateKey
privateKey
=
CryptoUtils
.
readPrivateKey
(
key
);
byte
[]
sig
=
bootsig
.
sign
(
privateKey
,
in
,
signableSize
);
byte
[]
sig
=
bootsig
.
sign
(
privateKey
,
in
,
signableSize
);
...
...
signing/src/main/resources/keys/verity.pk8
0 → 100644
View file @
085ea6d0
File added
signing/src/main/resources/keys/verity.x509.pem
0 → 100644
View file @
085ea6d0
-----BEGIN CERTIFICATE-----
MIID/TCCAuWgAwIBAgIJAJcPmDkJqolJMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
Fw0xNDExMDYxOTA3NDBaFw00MjAzMjQxOTA3NDBaMIGUMQswCQYDVQQGEwJVUzET
MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAOjreE0vTVSRenuzO9vnaWfk0eQzYab0gqpi
6xAzi6dmD+ugoEKJmbPiuE5Dwf21isZ9uhUUu0dQM46dK4ocKxMRrcnmGxydFn6o
fs3ODJMXOkv2gKXL/FdbEPdDbxzdu8z3yk+W67udM/fW7WbaQ3DO0knu+izKak/3
T41c5uoXmQ81UNtAzRGzGchNVXMmWuTGOkg6U+0I2Td7K8yvUMWhAWPPpKLtVH9r
AL5TzjYNR92izdKcz3AjRsI3CTjtpiVABGeX0TcjRSuZB7K9EK56HV+OFNS6I1NP
jdD7FIShyGlqqZdUOkAUZYanbpgeT5N7QL6uuqcGpoTOkalu6kkCAwEAAaNQME4w
HQYDVR0OBBYEFH5DM/m7oArf4O3peeKO0ZIEkrQPMB8GA1UdIwQYMBaAFH5DM/m7
oArf4O3peeKO0ZIEkrQPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
AHO3NSvDE5jFvMehGGtS8BnFYdFKRIglDMc4niWSzhzOVYRH4WajxdtBWc5fx0ix
NF/+hVKVhP6AIOQa+++sk+HIi7RvioPPbhjcsVlZe7cUEGrLSSveGouQyc+j0+m6
JF84kszIl5GGNMTnx0XRPO+g8t6h5LWfnVydgZfpGRRg+WHewk1U2HlvTjIceb0N
dcoJ8WKJAFWdcuE7VIm4w+vF/DYX/A2Oyzr2+QRhmYSv1cusgAeC1tvH4ap+J1Lg
UnOu5Kh/FqPLLSwNVQp4Bu7b9QFfqK8Moj84bj88NqRGZgDyqzuTrFxn6FW7dmyA
yttuAJAEAymk1mipd9+zp38=
-----END CERTIFICATE-----
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