diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5f9fb5f..54a2e8b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # Make sure the release step uses its own credentials: # https://github.com/cycjimmy/semantic-release-action#private-packages diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0641727..188fb70 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Open pull request uses: repo-sync/pull-request@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 98e491c..73cc6b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +# [1.1.0-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.0-dev.1...v1.1.0-dev.2) (2023-09-25) + + +### Bug Fixes + +* Use correct function name casing ([ef38d8b](https://github.com/ReVanced/revanced-library/commit/ef38d8b4bfe3a79c25fb40588c6217c09574770f)) + +# [1.1.0-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.0.2-dev.1...v1.1.0-dev.1) (2023-09-25) + + +### Features + +* Increase the key size to 4096 ([892e083](https://github.com/ReVanced/revanced-library/commit/892e0835c6b2da0836bd6ba1d8603db1848cc2d9)) + +## [1.0.2-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.0.1...v1.0.2-dev.1) (2023-09-25) + + +### Bug Fixes + +* Only load the keystore once per instantiation ([5993f7e](https://github.com/ReVanced/revanced-library/commit/5993f7e568543c777bee51a140c34fa8953a178a)) + ## [1.0.1](https://github.com/ReVanced/revanced-library/compare/v1.0.0...v1.0.1) (2023-09-24) diff --git a/api/revanced-library.api b/api/revanced-library.api index a12b338..2d0cddb 100644 --- a/api/revanced-library.api +++ b/api/revanced-library.api @@ -2,8 +2,8 @@ public final class app/revanced/library/ApkSigner { public static final field INSTANCE Lapp/revanced/library/ApkSigner; public final fun newApkSignerBuilder (Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair;Ljava/lang/String;Ljava/lang/String;)Lcom/android/apksig/ApkSigner$Builder; public final fun newApkSignerBuilder (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/android/apksig/ApkSigner$Builder; + public final fun newKeyStore (Ljava/io/OutputStream;Ljava/lang/String;Ljava/util/List;)V public final fun newKeyStore (Ljava/util/List;)Ljava/security/KeyStore; - public final fun newKeystore (Ljava/io/OutputStream;Ljava/lang/String;Ljava/util/List;)V public final fun newPrivateKeyCertificatePair (Ljava/lang/String;Ljava/util/Date;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair; public static synthetic fun newPrivateKeyCertificatePair$default (Lapp/revanced/library/ApkSigner;Ljava/lang/String;Ljava/util/Date;ILjava/lang/Object;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair; public final fun readKeyCertificatePair (Ljava/security/KeyStore;Ljava/lang/String;Ljava/lang/String;)Lapp/revanced/library/ApkSigner$PrivateKeyCertificatePair; diff --git a/gradle.properties b/gradle.properties index 8dc16cb..3d201e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 1.0.1 +version = 1.1.0-dev.2 diff --git a/src/main/kotlin/app/revanced/library/ApkSigner.kt b/src/main/kotlin/app/revanced/library/ApkSigner.kt index 91743d4..d01bc73 100644 --- a/src/main/kotlin/app/revanced/library/ApkSigner.kt +++ b/src/main/kotlin/app/revanced/library/ApkSigner.kt @@ -45,7 +45,7 @@ object ApkSigner { // Generate a new key pair. val keyPair = KeyPairGenerator.getInstance("RSA").apply { - initialize(2048) + initialize(4096) }.generateKeyPair() var serialNumber: BigInteger @@ -116,8 +116,9 @@ object ApkSigner { logger.fine("Creating keystore") return KeyStore.getInstance("BKS", BouncyCastleProvider.PROVIDER_NAME).apply { + load(null) + entries.forEach { entry -> - load(null) // Add all entries to the keystore. setKeyEntry( entry.alias, @@ -136,7 +137,7 @@ object ApkSigner { * @param keyStorePassword The password for the keystore. * @param entries The entries to add to the keystore. */ - fun newKeystore( + fun newKeyStore( keyStoreOutputStream: OutputStream, keyStorePassword: String, entries: List