KEMBAR78
ANDROID: Bundle CA certificates and cleanups by lephilousophe · Pull Request #4859 · scummvm/scummvm · GitHub
Skip to content

ANDROID: Bundle CA certificates and cleanups #4859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Apr 2, 2023
Merged

ANDROID: Bundle CA certificates and cleanups #4859

merged 3 commits into from
Apr 2, 2023

Conversation

@lephilousophe
Copy link
Member

Bundle CA certificates and make use of it instead of not verifying peers.

Cleanup configure to not define macros pointing to /usr/local and remove the ANDROID_PLAIN_PORT define which is not used anymore.

@lephilousophe
ANDROID: Don't set DATA_DIR and PLUGIN_DIRECTORY
75eaa3d 
Android doesn't have the concept of prefix so these pointed to something
invalid
@lephilousophe
ANDROID: Bundle cacert.pem and don't disable certificate checks
7ed4e8b
@lephilousophe
ANDROID: Remove ANDROID_PLAIN_PORT defines
73f083f 
They are not used anymore and we don't have any other kind of port
anymore
@lephilousophe lephilousophe requested a review from antoniou79 April 1, 2023 12:47
antoniou79
antoniou79 approved these changes Apr 1, 2023
View reviewed changes
Copy link
Contributor

@antoniou79 antoniou79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I haven't tried building it, but it seems good to merge.

I guess my only question is, where will we be defining DIST_ANDROID_CACERT_PEM? Will it be in the docker image with the android toolchain or external to that (downloaded by the one who builds the apks?)

LittleToonCat
LittleToonCat approved these changes Apr 1, 2023
View reviewed changes
Copy link
Contributor

@LittleToonCat LittleToonCat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested SCUMM HE lobby connection with it, works beautifully. Thank you!

Good to merge. 👍

@lephilousophe
Copy link
Member Author

I guess my only question is, where will we be defining DIST_ANDROID_CACERT_PEM? Will it be in the docker image with the android toolchain or external to that (downloaded by the one who builds the apks?)

In the buildbot, it's (already) defined in the platform definition as an environment variable.

In the toolchain you can use export DIST_ANDROID_CACERT_PEM="/etc/ssl/certs/ca-certificates.crt" before building: this will use Debian certificates.
If you don't define this variable, the cacert.pem from curl is downloaded (coming from Mozilla).
It can be refreshed later (if you don't run make clean) by running make androidcacert.

This way, we avoid fetching from Internet the certificates if we don't need to, but it's also possible for those who prefers it.

@antoniou79
Copy link
Contributor

Thank you for clarifying.

@lephilousophe lephilousophe merged commit 1af55ed into scummvm:master Apr 2, 2023
@lephilousophe lephilousophe deleted the android-cacert branch April 2, 2023 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@antoniou79 antoniou79 antoniou79 approved these changes

@LittleToonCat LittleToonCat LittleToonCat approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lephilousophe @antoniou79 @LittleToonCat