Skip to content
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.

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

Remove 3DES from conscrypt #1267

Closed
wants to merge 6 commits into from
Closed

Conversation

miguelaranda0
Copy link
Collaborator

No description provided.

miguelaranda0 and others added 4 commits December 3, 2024 17:14
This class is created by codegen in the gmscore version of conscrypt and so we need the logging path to go through it in order for it to be replaced in gmscore
This class is created by codegen in the gmscore version of conscrypt and so we need the logging path to go through it in order for it to be replaced in gmscore
Bug: 357870429
Ignore-AOSP-First: Security fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c47caf05209b8adadb6c71689b29b6608680329)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7ffe97a8034fc98d4f91e0a24793d5f99200523f)
Merged-In: Ic61848e0455a48ea4b39cd67ef78280aa403beba
Change-Id: Ic61848e0455a48ea4b39cd67ef78280aa403beba
@tweksteen
Copy link
Member

Sorry for the "Merge branch 'master' into upload2. I thought that this button would rebase your change on top of master but it did the opposite.

Could you update your branch so that only the commit "Remove 3DES from conscrypt" appears in the pull request? Thanks

Note: this deprecates those protocols, but please let me know if I
should revert that part of the change.

This reverts commit 5ae7b5c2f272365d13c9ff3ba0c7a682375dc1d8.

Reason for revert: fixed the failures by checking that API levels are not higher than a 100, and bumped API level check to 36 because I noticed that this version of using reflection is more resilient than the previous one.

Change-Id: I42fcb922e046072eea0fa5aee07c513233d2b1e9
@miguelaranda0 miguelaranda0 deleted the upload2 branch December 7, 2024 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants