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

Commit 430e142d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update source for Rust 1.63.0" am: 2d839a2d am: c6ea0300 am:... 

Merge "Update source for Rust 1.63.0" am: 2d839a2d am: c6ea0300 am: 35cd9d0b am: 60d59044 am: 29dbf98e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2192137



Change-Id: Id03d7651ff9723e5d74d67e946a6ea603587ffa1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a544b386 29dbf98e

tools/rootcanal/lmp/src/ec.rs

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ use rand::{thread_rng, Rng}; 
use std::convert::TryInto;

use std::marker::PhantomData;



#[derive(Debug, Clone, PartialEq)]

#[derive(Debug, Clone, PartialEq, Eq)]

pub enum PublicKey {

    P192([u8; P192r1::PUBLIC_KEY_SIZE]),

    P256([u8; P256r1::PUBLIC_KEY_SIZE]),
@@ -89,13 +89,13 @@ impl PublicKey { 
    }

}



#[derive(Debug, Clone, PartialEq)]

#[derive(Debug, Clone, PartialEq, Eq)]

pub enum PrivateKey {

    P192([u8; P192r1::PRIVATE_KEY_SIZE]),

    P256([u8; P256r1::PRIVATE_KEY_SIZE]),

}



#[derive(Debug, Clone, PartialEq)]

#[derive(Debug, Clone, PartialEq, Eq)]

pub enum DhKey {

    P192([u8; P192r1::PUBLIC_KEY_SIZE]),

    P256([u8; P256r1::PUBLIC_KEY_SIZE]),