diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0be576f2d7..8d6d5e8842 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,7 +141,6 @@ fdroid lint: - *install_fdroid_server script: - chown -R $(whoami) . - - cp tools/lint_config.yml config.yml - *get_changed_apps - export EXITVALUE=0 - function set_error() { export EXITVALUE=1; printf "\x1b[31mERROR `history|tail -2|head -1|cut -b 6-500`\x1b[0m\n"; } diff --git a/config.yml b/config.yml index 14f2237435..fde4da1fa1 100644 --- a/config.yml +++ b/config.yml @@ -43,3 +43,19 @@ keyaliases: com.termux.window: '@com.termux' org.fdroid.fdroid.privileged: 'ciarang' org.fdroid.fdroid: 'ciarang' + +# APKs signed by publicly available private signing keys are not +# allowed to be included in this repo, even if they are reproducible. +# +# Hash calculated with `openssl x509 -in -outform der | sha256sum` +apk_signing_key_block_list: + # https://android.googlesource.com/platform/build/+/refs/heads/main/target/product/security + - a6ccc500ff0e7421200eb66a7fe174ef1b00e52ca91727070cbedf061ff76c35 # AOSP bluetooth.x509.pem + - ce7b2b47ae2b7552c8f92cc29124279883041fb623a5f194a82c9bf15d492aa0 # AOSP cts_uicc_2021.x509.pem + - 465983f7791f2abeb43ea2cbdc7f21a8260b72bc08a55c839fc1a43bc741a81e # AOSP media.x509.pem + - e1dbadce60dc080d15b58a014b0dcf9400e24de23fa00b287a5a982bfebda2ee # AOSP networkstack.x509.pem + - fae9122a8721d6e2a196d2224dffcf773c9127e2bb956cbddb40b009192ffdfd # AOSP nfc.x509.pem + - c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8 # AOSP platform.x509.pem + - abf21f9e2af1d881cc673fddcefa6ed9c269a437bd64b279cf45844cfd589126 # AOSP sdk_sandbox.x509.pem + - 28bbfe4a7b97e74681dc55c2fbb6ccb8d6c74963733f6af6ae74d8c3a6e879fd # AOSP shared.x509.pem + - a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc # AOSP testkey.x509.pem diff --git a/tools/lint_config.yml b/tools/lint_config.yml deleted file mode 100644 index 8e36e3e966..0000000000 --- a/tools/lint_config.yml +++ /dev/null @@ -1,13 +0,0 @@ -archive_older: 3 -apk_signing_key_block_list: - # Hash calculated with `openssl x509 -in -outform der | sha256sum` - # https://android.googlesource.com/platform/build/+/refs/heads/main/target/product/security - - a6ccc500ff0e7421200eb66a7fe174ef1b00e52ca91727070cbedf061ff76c35 # AOSP bluetooth.x509.pem - - ce7b2b47ae2b7552c8f92cc29124279883041fb623a5f194a82c9bf15d492aa0 # AOSP cts_uicc_2021.x509.pem - - 465983f7791f2abeb43ea2cbdc7f21a8260b72bc08a55c839fc1a43bc741a81e # AOSP media.x509.pem - - e1dbadce60dc080d15b58a014b0dcf9400e24de23fa00b287a5a982bfebda2ee # AOSP networkstack.x509.pem - - fae9122a8721d6e2a196d2224dffcf773c9127e2bb956cbddb40b009192ffdfd # AOSP nfc.x509.pem - - c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8 # AOSP platform.x509.pem - - abf21f9e2af1d881cc673fddcefa6ed9c269a437bd64b279cf45844cfd589126 # AOSP sdk_sandbox.x509.pem - - 28bbfe4a7b97e74681dc55c2fbb6ccb8d6c74963733f6af6ae74d8c3a6e879fd # AOSP shared.x509.pem - - a40da80a59d170caa950cf15c18c454d47a39b26989d8b640ecd745ba71bf5dc # AOSP testkey.x509.pem