Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

8505785f

Commit 8505785f authored 1 year ago by Eran Messeri Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Revert^2 "Keystore: Validate curve names in XDH and ED25519"" into main...

Merge "Revert^2 "Keystore: Validate curve names in XDH and ED25519"" into main am: 711efaa0 am: d4d7a24e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2929612

Change-Id: Ifbf62a76e80ba289edaa808772b924121d42d95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1710ea26 d4d7a24e

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java 30 additions, 3 deletions

...ecurity/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java 3 additions, 0 deletions

...a/android/security/keystore2/AndroidKeyStoreProvider.java

with 33 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment