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
0bdbcad8
Commit
0bdbcad8
authored
May 14, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't specify Provider
parent
80cd85b0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
SignAPK.java
signing/src/main/java/com/topjohnwu/signing/SignAPK.java
+2
-9
No files found.
signing/src/main/java/com/topjohnwu/signing/SignAPK.java
View file @
0bdbcad8
...
@@ -33,8 +33,6 @@ import java.security.GeneralSecurityException;
...
@@ -33,8 +33,6 @@ import java.security.GeneralSecurityException;
import
java.security.KeyStore
;
import
java.security.KeyStore
;
import
java.security.MessageDigest
;
import
java.security.MessageDigest
;
import
java.security.PrivateKey
;
import
java.security.PrivateKey
;
import
java.security.Provider
;
import
java.security.Security
;
import
java.security.cert.CertificateEncodingException
;
import
java.security.cert.CertificateEncodingException
;
import
java.security.cert.X509Certificate
;
import
java.security.cert.X509Certificate
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -59,7 +57,6 @@ public class SignAPK {
...
@@ -59,7 +57,6 @@ public class SignAPK {
private
static
final
String
CERT_SF_NAME
=
"META-INF/CERT.SF"
;
private
static
final
String
CERT_SF_NAME
=
"META-INF/CERT.SF"
;
private
static
final
String
CERT_SIG_NAME
=
"META-INF/CERT.%s"
;
private
static
final
String
CERT_SIG_NAME
=
"META-INF/CERT.%s"
;
private
static
Provider
sBouncyCastleProvider
=
Security
.
getProvider
(
"BC"
);
// bitmasks for which hash algorithms we need the manifest to include.
// bitmasks for which hash algorithms we need the manifest to include.
private
static
final
int
USE_SHA1
=
1
;
private
static
final
int
USE_SHA1
=
1
;
private
static
final
int
USE_SHA256
=
2
;
private
static
final
int
USE_SHA256
=
2
;
...
@@ -140,8 +137,7 @@ public class SignAPK {
...
@@ -140,8 +137,7 @@ public class SignAPK {
*/
*/
private
static
int
getDigestAlgorithm
(
X509Certificate
cert
)
{
private
static
int
getDigestAlgorithm
(
X509Certificate
cert
)
{
String
sigAlg
=
cert
.
getSigAlgName
().
toUpperCase
(
Locale
.
US
);
String
sigAlg
=
cert
.
getSigAlgName
().
toUpperCase
(
Locale
.
US
);
if
(
"SHA1WITHRSA"
.
equals
(
sigAlg
)
||
if
(
sigAlg
.
startsWith
(
"SHA1WITHRSA"
)
||
sigAlg
.
startsWith
(
"MD5WITHRSA"
))
{
"MD5WITHRSA"
.
equals
(
sigAlg
))
{
// see "HISTORICAL NOTE" above.
return
USE_SHA1
;
return
USE_SHA1
;
}
else
if
(
sigAlg
.
startsWith
(
"SHA256WITH"
))
{
}
else
if
(
sigAlg
.
startsWith
(
"SHA256WITH"
))
{
return
USE_SHA256
;
return
USE_SHA256
;
...
@@ -309,13 +305,10 @@ public class SignAPK {
...
@@ -309,13 +305,10 @@ public class SignAPK {
JcaCertStore
certs
=
new
JcaCertStore
(
certList
);
JcaCertStore
certs
=
new
JcaCertStore
(
certList
);
CMSSignedDataGenerator
gen
=
new
CMSSignedDataGenerator
();
CMSSignedDataGenerator
gen
=
new
CMSSignedDataGenerator
();
ContentSigner
signer
=
new
JcaContentSignerBuilder
(
getSignatureAlgorithm
(
publicKey
))
ContentSigner
signer
=
new
JcaContentSignerBuilder
(
getSignatureAlgorithm
(
publicKey
))
.
setProvider
(
sBouncyCastleProvider
)
.
build
(
privateKey
);
.
build
(
privateKey
);
gen
.
addSignerInfoGenerator
(
gen
.
addSignerInfoGenerator
(
new
JcaSignerInfoGeneratorBuilder
(
new
JcaSignerInfoGeneratorBuilder
(
new
JcaDigestCalculatorProviderBuilder
()
new
JcaDigestCalculatorProviderBuilder
().
build
())
.
setProvider
(
sBouncyCastleProvider
)
.
build
())
.
setDirectSignature
(
true
)
.
setDirectSignature
(
true
)
.
build
(
signer
,
publicKey
));
.
build
(
signer
,
publicKey
));
gen
.
addCertificates
(
certs
);
gen
.
addCertificates
(
certs
);
...
...
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