evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restyled by rustfmt

Browse source
This commit is contained in:
Restyled.io 2023-04-02 11:11:03 +00:00 • committed by Wakahisa
parent 0fa21700d5
commit 856a689d1b
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
matter/src/crypto/crypto_rustcrypto.rs
View file

@ -26,12 +26,17 @@ use ccm::{
use elliptic_curve::sec1::{FromEncodedPoint, ToEncodedPoint}; use elliptic_curve::sec1::{FromEncodedPoint, ToEncodedPoint};
use hmac::Mac; use hmac::Mac;
use log::error; use log::error;
use p256::{ecdsa::{SigningKey, VerifyingKey, Signature}, SecretKey, PublicKey, EncodedPoint, AffinePoint}; use p256::{
ecdsa::{Signature, SigningKey, VerifyingKey},
AffinePoint, EncodedPoint, PublicKey, SecretKey,
};
use sha2::Digest; use sha2::Digest;
use x509_cert::{ use x509_cert::{
attr::AttributeType, attr::AttributeType,
der::{asn1::BitString, Any, Encode}, der::{asn1::BitString, Any, Encode},
spki::{AlgorithmIdentifier, SubjectPublicKeyInfoOwned}, name::RdnSequence, request::CertReq, name::RdnSequence,
request::CertReq,
spki::{AlgorithmIdentifier, SubjectPublicKeyInfoOwned},
}; };
use crate::error::Error; use crate::error::Error;
@ -159,20 +164,19 @@ impl CryptoKeyPair for KeyPair {
fn get_csr<'a>(&self, out_csr: &'a mut [u8]) -> Result<&'a [u8], Error> { fn get_csr<'a>(&self, out_csr: &'a mut [u8]) -> Result<&'a [u8], Error> {
use p256::ecdsa::signature::Signer; use p256::ecdsa::signature::Signer;
let subject = let subject = RdnSequence(vec![x509_cert::name::RelativeDistinguishedName(
RdnSequence(vec![x509_cert::name::RelativeDistinguishedName( vec![x509_cert::attr::AttributeTypeAndValue {
vec![x509_cert::attr::AttributeTypeAndValue { // Organization name: http://www.oid-info.com/get/2.5.4.10
// Organization name: http://www.oid-info.com/get/2.5.4.10 oid: x509_cert::attr::AttributeType::new_unwrap("2.5.4.10"),
oid: x509_cert::attr::AttributeType::new_unwrap("2.5.4.10"), value: x509_cert::attr::AttributeValue::new(
value: x509_cert::attr::AttributeValue::new( x509_cert::der::Tag::Utf8String,
x509_cert::der::Tag::Utf8String, "CSR".as_bytes(),
"CSR".as_bytes(), )
)
.unwrap(),
}]
.try_into()
.unwrap(), .unwrap(),
)]); }]
.try_into()
.unwrap(),
)]);
let mut pubkey = [0; 65]; let mut pubkey = [0; 65];
self.get_public_key(&mut pubkey).unwrap(); self.get_public_key(&mut pubkey).unwrap();
let info = x509_cert::request::CertReqInfo { let info = x509_cert::request::CertReqInfo {