Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ede61256 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Secretkeeper: use Ed25519 identity key" into main am: b87fae42 am:... 

Merge "Secretkeeper: use Ed25519 identity key" into main am: b87fae42 am: 1479a638 am: c703fefa

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2900721



Change-Id: I7cc3158152888b5544827ee09b7e6f7cded915c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac6b2feb c703fefa

security/secretkeeper/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ rust_library { 
        "libauthgraph_core",

        "libauthgraph_hal",

        "libbinder_rs",

        "libcoset",

        "liblog_rust",

        "libsecretkeeper_core_nostd",

        "libsecretkeeper_comm_nostd",

security/secretkeeper/default/src/lib.rs

+6 −2
Original line number Diff line number Diff line
@@ -53,7 +53,11 @@ impl LocalTa { 
            let mut crypto_impls = boring::crypto_trait_impls();

            let storage_impl = Box::new(store::InMemoryStore::default());

            let sk_ta = Rc::new(RefCell::new(

                SecretkeeperTa::new(&mut crypto_impls, storage_impl)

                SecretkeeperTa::new(

                    &mut crypto_impls,

                    storage_impl,

                    coset::iana::EllipticCurve::Ed25519,

                )

                .expect("Failed to create local Secretkeeper TA"),

            ));

            let mut ag_ta = AuthGraphTa::new(