SHA256 support (#355)

fundthmcalculus · allibell · commit a65f2911a112 · 2022-02-13T00:18:29.000-08:00
diff --git a/include/okapi.h b/include/okapi.h
@@ -90,3 +90,7 @@ int32_t blake3_keyed_hash(struct ByteBuffer request,
 int32_t blake3_derive_key(struct ByteBuffer request,
                           struct ByteBuffer *response,
                           struct ExternError *err);
+
+int32_t sha256_hash(struct ByteBuffer request,
+                    struct ByteBuffer *response,
+                    struct ExternError *err);
diff --git a/native/src/ffi/hashing.rs b/native/src/ffi/hashing.rs
@@ -15,3 +15,8 @@ pub extern "C" fn blake3_keyed_hash(request: ByteBuffer, response: &mut ByteBuff
 pub extern "C" fn blake3_derive_key(request: ByteBuffer, response: &mut ByteBuffer, err: &mut ExternError) -> i32 {
     c_impl!(Blake3DeriveKeyRequest, Hashing, blake3_derive_key, request, response, err)
 }
+
+#[no_mangle]
+pub extern "C" fn sha256_hash(request: ByteBuffer, response: &mut ByteBuffer, err: &mut ExternError) -> i32 {
+    c_impl!(Sha256HashRequest, Hashing, sha256_hash, request, response, err)
+}
diff --git a/native/src/hashing/mod.rs b/native/src/hashing/mod.rs
@@ -1,5 +1,6 @@
 use std::convert::TryFrom;
 use std::str;
+use sha2::Digest;
 
 use crate::{didcomm::Error, proto::okapi::okapi_hashing::*};
 
@@ -34,13 +35,35 @@ impl crate::Hashing {
             digest: hash1.to_vec(),
         })
     }
+
+    pub fn sha256_hash<'a>(request: &Sha256HashRequest) -> Result<Sha256HashResponse, Error<'a>> {
+        let data = request.data.clone();
+        // Hash the provided data
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(data.as_slice());
+        Ok(Sha256HashResponse {
+            digest: hasher.finalize().to_vec(),
+        })
+    }
 }
 
 #[cfg(test)]
 mod test {
     use std::convert::TryFrom;
+    use sha2::Digest;
     use crate::{Hashing};
-    use crate::proto::hashing::{Blake3DeriveKeyRequest, Blake3HashRequest, Blake3KeyedHashRequest};
+    use crate::proto::hashing::{Blake3DeriveKeyRequest, Blake3HashRequest, Blake3KeyedHashRequest, Sha256HashRequest};
+
+    #[test]
+    fn test_sha256_hash() {
+        let data = "Hello, world!";
+        let request = Sha256HashRequest{data: data.as_bytes().to_vec() };
+        let response = Hashing::sha256_hash(&request).unwrap();
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(data.as_bytes());
+        let hash_data = hasher.finalize();
+        assert_eq!(response.digest.as_slice(), hash_data.to_vec().as_slice())
+    }
 
     #[test]
     fn test_blake3_hash() {
diff --git a/native/src/proto/okapi/okapi_hashing.rs b/native/src/proto/okapi/okapi_hashing.rs
@@ -38,3 +38,15 @@ pub struct Blake3DeriveKeyResponse {
     #[prost(bytes="vec", tag="1")]
     pub digest: ::prost::alloc::vec::Vec<u8>,
 }
+#[derive(::serde::Serialize, ::serde::Deserialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Sha256HashRequest {
+    #[prost(bytes="vec", tag="1")]
+    pub data: ::prost::alloc::vec::Vec<u8>,
+}
+#[derive(::serde::Serialize, ::serde::Deserialize)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Sha256HashResponse {
+    #[prost(bytes="vec", tag="1")]
+    pub digest: ::prost::alloc::vec::Vec<u8>,
+}
diff --git a/proto/okapi/hashing/v1/hashing.proto b/proto/okapi/hashing/v1/hashing.proto
@@ -32,3 +32,11 @@ message Blake3DeriveKeyRequest {
 message Blake3DeriveKeyResponse {
     bytes digest = 1;
 }
+
+message SHA256HashRequest {
+    bytes data = 1;
+}
+
+message SHA256HashResponse {
+    bytes digest = 1;
+}

Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,8 @@ pub extern "C" fn blake3_keyed_hash(request: ByteBuffer, response: &mut ByteBuff`
`15`	`15`	`pub extern "C" fn blake3_derive_key(request: ByteBuffer, response: &mut ByteBuffer, err: &mut ExternError) -> i32 {`
`16`	`16`	`c_impl!(Blake3DeriveKeyRequest, Hashing, blake3_derive_key, request, response, err)`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+#[no_mangle]`
	`20`	`+pub extern "C" fn sha256_hash(request: ByteBuffer, response: &mut ByteBuffer, err: &mut ExternError) -> i32 {`
	`21`	`+ c_impl!(Sha256HashRequest, Hashing, sha256_hash, request, response, err)`
	`22`	`+}`