Skip to content

Commit b26f8fb

Browse files
tmarkovskitmarkovski
committed
Cargo fmt
1 parent 34d705d commit b26f8fb

File tree

8 files changed

+1189
-1195
lines changed

8 files changed

+1189
-1195
lines changed

‎native/src/ffi/hashing.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ pub extern "C" fn blake3_derive_key(request: ByteBuffer, response: &mut ByteBuff
1919
#[no_mangle]
2020
pub extern "C" fn sha256_hash(request: ByteBuffer, response: &mut ByteBuffer, err: &mut ExternError) -> i32 {
2121
c_impl!(Sha256HashRequest, Hashing, sha256_hash, request, response, err)
22-
}
22+
}

‎native/src/ffi/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pub mod didcomm;
22
pub mod didkey;
3+
pub mod hashing;
34
pub mod ldproofs;
45
pub mod oberon;
56
pub mod utils;
6-
pub mod hashing;

‎native/src/hashing/mod.rs‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use sha2::Digest;
12
use std::convert::TryFrom;
23
use std::str;
3-
use sha2::Digest;
44

55
use crate::{didcomm::Error, proto::okapi::okapi_hashing::*};
66

@@ -31,9 +31,7 @@ impl crate::Hashing {
3131
let key_material = request.key_material.clone();
3232
// Hash the provided data
3333
let hash1 = blake3::derive_key(str::from_utf8(context.as_slice()).unwrap(), key_material.as_slice());
34-
Ok(Blake3DeriveKeyResponse {
35-
digest: hash1.to_vec(),
36-
})
34+
Ok(Blake3DeriveKeyResponse { digest: hash1.to_vec() })
3735
}
3836

3937
pub fn sha256_hash<'a>(request: &Sha256HashRequest) -> Result<Sha256HashResponse, Error<'a>> {
@@ -49,15 +47,17 @@ impl crate::Hashing {
4947

5048
#[cfg(test)]
5149
mod test {
52-
use std::convert::TryFrom;
53-
use sha2::Digest;
54-
use crate::{Hashing};
5550
use crate::proto::hashing::{Blake3DeriveKeyRequest, Blake3HashRequest, Blake3KeyedHashRequest, Sha256HashRequest};
51+
use crate::Hashing;
52+
use sha2::Digest;
53+
use std::convert::TryFrom;
5654

5755
#[test]
5856
fn test_sha256_hash() {
5957
let data = "Hello, world!";
60-
let request = Sha256HashRequest{data: data.as_bytes().to_vec() };
58+
let request = Sha256HashRequest {
59+
data: data.as_bytes().to_vec(),
60+
};
6161
let response = Hashing::sha256_hash(&request).unwrap();
6262
let mut hasher = sha2::Sha256::new();
6363
hasher.update(data.as_bytes());
@@ -68,7 +68,9 @@ mod test {
6868
#[test]
6969
fn test_blake3_hash() {
7070
let data = "Hello, world!";
71-
let request = Blake3HashRequest{data: data.as_bytes().to_vec() };
71+
let request = Blake3HashRequest {
72+
data: data.as_bytes().to_vec(),
73+
};
7274
let response = Hashing::blake3_hash(&request).unwrap();
7375
let hash_data = blake3::hash(data.as_bytes());
7476
assert_eq!(response.digest.as_slice(), hash_data.as_bytes())
@@ -78,7 +80,10 @@ mod test {
7880
fn test_blake3_keyed_hash() {
7981
let data = "Hello, world!";
8082
let key_str = format!("{:_<32}", "4113"); // Required to be 32-bytes
81-
let request = Blake3KeyedHashRequest{data: data.as_bytes().to_vec(), key: key_str.as_bytes().to_vec() };
83+
let request = Blake3KeyedHashRequest {
84+
data: data.as_bytes().to_vec(),
85+
key: key_str.as_bytes().to_vec(),
86+
};
8287
let response = Hashing::blake3_keyed_hash(&request).unwrap();
8388
let hash_data = blake3::keyed_hash(<&[u8; 32]>::try_from(key_str.as_bytes()).unwrap(), data.as_bytes());
8489
assert_eq!(response.digest.as_slice(), hash_data.as_bytes())
@@ -88,15 +93,21 @@ mod test {
8893
fn test_blake3_keyed_hash_invalid_size() {
8994
let data = "Hello, world!";
9095
let key_str = format!("{:_<16}", "4113"); // Required to be 32-bytes
91-
let request = Blake3KeyedHashRequest{data: data.as_bytes().to_vec(), key: key_str.as_bytes().to_vec() };
96+
let request = Blake3KeyedHashRequest {
97+
data: data.as_bytes().to_vec(),
98+
key: key_str.as_bytes().to_vec(),
99+
};
92100
assert!(Hashing::blake3_keyed_hash(&request).is_err());
93101
}
94102

95103
#[test]
96104
fn test_blake3_derive_key() {
97105
let data = "Hello, world!";
98106
let context = "EARTH:USA";
99-
let request = Blake3DeriveKeyRequest{context: context.as_bytes().to_vec(), key_material: data.as_bytes().to_vec()};
107+
let request = Blake3DeriveKeyRequest {
108+
context: context.as_bytes().to_vec(),
109+
key_material: data.as_bytes().to_vec(),
110+
};
100111
let response = Hashing::blake3_derive_key(&request).unwrap();
101112
let hash_data = blake3::derive_key(&*context, data.as_bytes());
102113
assert_eq!(response.digest.as_slice(), hash_data)

‎native/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
extern crate ffi_support;
21
extern crate core;
2+
extern crate ffi_support;
33

44
use prost::{DecodeError, Message};
55

@@ -42,13 +42,13 @@ pub mod didcomm;
4242
pub mod didkey;
4343
#[cfg(feature = "ffi")]
4444
mod ffi;
45+
#[cfg(feature = "hashing")]
46+
pub mod hashing;
4547
mod ldproofs;
4648
pub mod oberon;
4749
pub mod proto;
4850
#[cfg(test)]
4951
mod tests;
50-
#[cfg(feature = "hashing")]
51-
pub mod hashing;
5252

5353
pub mod google {
5454
pub mod protobuf {

‎native/src/proto/okapi/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pub mod okapi_examples;
2+
pub mod okapi_hashing;
23
pub mod okapi_keys;
34
pub mod okapi_proofs;
45
pub mod okapi_security;
56
pub mod okapi_transport;
6-
pub mod okapi_security;
7-
pub mod okapi_hashing;

‎native/src/proto/okapi/okapi_hashing.rs‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,44 @@
1-
#[derive(::serde::Serialize, ::serde::Deserialize)]
2-
#[derive(Clone, PartialEq, ::prost::Message)]
1+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
32
pub struct Blake3HashRequest {
4-
#[prost(bytes="vec", tag="1")]
3+
#[prost(bytes = "vec", tag = "1")]
54
pub data: ::prost::alloc::vec::Vec<u8>,
65
}
7-
#[derive(::serde::Serialize, ::serde::Deserialize)]
8-
#[derive(Clone, PartialEq, ::prost::Message)]
6+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
97
pub struct Blake3HashResponse {
10-
#[prost(bytes="vec", tag="1")]
8+
#[prost(bytes = "vec", tag = "1")]
119
pub digest: ::prost::alloc::vec::Vec<u8>,
1210
}
13-
#[derive(::serde::Serialize, ::serde::Deserialize)]
14-
#[derive(Clone, PartialEq, ::prost::Message)]
11+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
1512
pub struct Blake3KeyedHashRequest {
16-
#[prost(bytes="vec", tag="1")]
13+
#[prost(bytes = "vec", tag = "1")]
1714
pub data: ::prost::alloc::vec::Vec<u8>,
18-
#[prost(bytes="vec", tag="2")]
15+
#[prost(bytes = "vec", tag = "2")]
1916
pub key: ::prost::alloc::vec::Vec<u8>,
2017
}
21-
#[derive(::serde::Serialize, ::serde::Deserialize)]
22-
#[derive(Clone, PartialEq, ::prost::Message)]
18+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
2319
pub struct Blake3KeyedHashResponse {
24-
#[prost(bytes="vec", tag="1")]
20+
#[prost(bytes = "vec", tag = "1")]
2521
pub digest: ::prost::alloc::vec::Vec<u8>,
2622
}
27-
#[derive(::serde::Serialize, ::serde::Deserialize)]
28-
#[derive(Clone, PartialEq, ::prost::Message)]
23+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
2924
pub struct Blake3DeriveKeyRequest {
30-
#[prost(bytes="vec", tag="1")]
25+
#[prost(bytes = "vec", tag = "1")]
3126
pub context: ::prost::alloc::vec::Vec<u8>,
32-
#[prost(bytes="vec", tag="2")]
27+
#[prost(bytes = "vec", tag = "2")]
3328
pub key_material: ::prost::alloc::vec::Vec<u8>,
3429
}
35-
#[derive(::serde::Serialize, ::serde::Deserialize)]
36-
#[derive(Clone, PartialEq, ::prost::Message)]
30+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
3731
pub struct Blake3DeriveKeyResponse {
38-
#[prost(bytes="vec", tag="1")]
32+
#[prost(bytes = "vec", tag = "1")]
3933
pub digest: ::prost::alloc::vec::Vec<u8>,
4034
}
41-
#[derive(::serde::Serialize, ::serde::Deserialize)]
42-
#[derive(Clone, PartialEq, ::prost::Message)]
35+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
4336
pub struct Sha256HashRequest {
44-
#[prost(bytes="vec", tag="1")]
37+
#[prost(bytes = "vec", tag = "1")]
4538
pub data: ::prost::alloc::vec::Vec<u8>,
4639
}
47-
#[derive(::serde::Serialize, ::serde::Deserialize)]
48-
#[derive(Clone, PartialEq, ::prost::Message)]
40+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
4941
pub struct Sha256HashResponse {
50-
#[prost(bytes="vec", tag="1")]
42+
#[prost(bytes = "vec", tag = "1")]
5143
pub digest: ::prost::alloc::vec::Vec<u8>,
5244
}

‎native/src/proto/pbmse/pbmse.rs‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,67 @@
11
/// JWS
22
/// Protocol buffer message signing and encryption
3-
#[derive(::serde::Serialize, ::serde::Deserialize)]
4-
#[derive(Clone, PartialEq, ::prost::Message)]
3+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
54
pub struct SignedMessage {
6-
#[prost(bytes="vec", tag="1")]
5+
#[prost(bytes = "vec", tag = "1")]
76
pub payload: ::prost::alloc::vec::Vec<u8>,
8-
#[prost(message, repeated, tag="2")]
7+
#[prost(message, repeated, tag = "2")]
98
pub signatures: ::prost::alloc::vec::Vec<Signature>,
109
}
11-
#[derive(::serde::Serialize, ::serde::Deserialize)]
12-
#[derive(Clone, PartialEq, ::prost::Message)]
10+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
1311
pub struct Signature {
14-
#[prost(bytes="vec", tag="1")]
12+
#[prost(bytes = "vec", tag = "1")]
1513
pub header: ::prost::alloc::vec::Vec<u8>,
16-
#[prost(bytes="vec", tag="3")]
14+
#[prost(bytes = "vec", tag = "3")]
1715
pub signature: ::prost::alloc::vec::Vec<u8>,
1816
}
19-
#[derive(::serde::Serialize, ::serde::Deserialize)]
20-
#[derive(Clone, PartialEq, ::prost::Message)]
17+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
2118
pub struct SignatureHeader {
22-
#[prost(string, tag="1")]
19+
#[prost(string, tag = "1")]
2320
pub algorithm: ::prost::alloc::string::String,
24-
#[prost(string, tag="2")]
21+
#[prost(string, tag = "2")]
2522
pub key_id: ::prost::alloc::string::String,
2623
}
2724
// JWE
2825

29-
#[derive(::serde::Serialize, ::serde::Deserialize)]
30-
#[derive(Clone, PartialEq, ::prost::Message)]
26+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
3127
pub struct EncryptedMessage {
32-
#[prost(bytes="vec", tag="1")]
28+
#[prost(bytes = "vec", tag = "1")]
3329
pub iv: ::prost::alloc::vec::Vec<u8>,
34-
#[prost(bytes="vec", tag="2")]
30+
#[prost(bytes = "vec", tag = "2")]
3531
pub aad: ::prost::alloc::vec::Vec<u8>,
36-
#[prost(bytes="vec", tag="3")]
32+
#[prost(bytes = "vec", tag = "3")]
3733
pub ciphertext: ::prost::alloc::vec::Vec<u8>,
38-
#[prost(bytes="vec", tag="4")]
34+
#[prost(bytes = "vec", tag = "4")]
3935
pub tag: ::prost::alloc::vec::Vec<u8>,
40-
#[prost(message, repeated, tag="5")]
36+
#[prost(message, repeated, tag = "5")]
4137
pub recipients: ::prost::alloc::vec::Vec<EncryptionRecipient>,
4238
}
43-
#[derive(::serde::Serialize, ::serde::Deserialize)]
44-
#[derive(Clone, PartialEq, ::prost::Message)]
39+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
4540
pub struct EncryptionHeader {
46-
#[prost(enumeration="EncryptionMode", tag="1")]
41+
#[prost(enumeration = "EncryptionMode", tag = "1")]
4742
pub mode: i32,
48-
#[prost(enumeration="EncryptionAlgorithm", tag="2")]
43+
#[prost(enumeration = "EncryptionAlgorithm", tag = "2")]
4944
pub algorithm: i32,
50-
#[prost(string, tag="3")]
45+
#[prost(string, tag = "3")]
5146
pub key_id: ::prost::alloc::string::String,
52-
#[prost(string, tag="4")]
47+
#[prost(string, tag = "4")]
5348
pub sender_key_id: ::prost::alloc::string::String,
5449
}
55-
#[derive(::serde::Serialize, ::serde::Deserialize)]
56-
#[derive(Clone, PartialEq, ::prost::Message)]
50+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, PartialEq, ::prost::Message)]
5751
pub struct EncryptionRecipient {
58-
#[prost(message, optional, tag="1")]
52+
#[prost(message, optional, tag = "1")]
5953
pub header: ::core::option::Option<EncryptionHeader>,
60-
#[prost(bytes="vec", tag="2")]
54+
#[prost(bytes = "vec", tag = "2")]
6155
pub content_encryption_key: ::prost::alloc::vec::Vec<u8>,
6256
}
63-
#[derive(::serde::Serialize, ::serde::Deserialize)]
64-
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
57+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
6558
#[repr(i32)]
6659
pub enum EncryptionMode {
6760
Unspecified = 0,
6861
Direct = 1,
6962
ContentEncryptionKey = 2,
7063
}
71-
#[derive(::serde::Serialize, ::serde::Deserialize)]
72-
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
64+
#[derive(::serde::Serialize, ::serde::Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
7365
#[repr(i32)]
7466
pub enum EncryptionAlgorithm {
7567
Unspecified = 0,

0 commit comments

Comments
 (0)