⬆️ use crypto_base 2.0 (#17)

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+---
+## [3.1.0] - 2022-07-01
+### Added
+### Changed
+- Bump the cosmian_crypto_base version
+### Fixed
+### Removed
+---
+
 ---
 ## [3.0.1] - 2022-06-21
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cover_crypt"
-version = "3.0.1"
+version = "3.1.0"
 edition = "2021"
 authors = [
   "Théophile Brezot <[email protected]>",
@@ -31,7 +31,7 @@ wasm_bindgen = ["js-sys", "wasm-bindgen"]
 python = ["pyo3"]
 
 [dependencies]
-cosmian_crypto_base = "1.3"
+cosmian_crypto_base = "2.0"
 hex = "0.4"
 leb128 = "0.2"
 rand_core = { version = "0.5", features = ["getrandom"] }

src/cover_crypt_core.rs

@@ -153,8 +153,7 @@ where
             }
             let partition = Partition::from(partition_bytes);
             let key_bytes = de.read_array()?;
-            let key =
-                <<KEM as Kem>::KeyPair as KeyPair>::PrivateKey::try_from_bytes(key_bytes.to_vec())?;
+            let key = <<KEM as Kem>::KeyPair as KeyPair>::PrivateKey::try_from_bytes(&key_bytes)?;
             map.insert(partition, key);
         }
         Ok(Self(map))
@@ -242,8 +241,7 @@ where
             }
             let partition = Partition::from(partition_bytes);
             let key_bytes = de.read_array()?;
-            let key =
-                <<KEM as Kem>::KeyPair as KeyPair>::PublicKey::try_from_bytes(key_bytes.to_vec())?;
+            let key = <<KEM as Kem>::KeyPair as KeyPair>::PublicKey::try_from_bytes(&key_bytes)?;
             map.insert(partition, key);
         }
         Ok(Self(map))

src/error.rs

@@ -4,15 +4,15 @@ use std::{
     num::{ParseIntError, TryFromIntError},
 };
 
-use cosmian_crypto_base::Error as CryptoError;
+use cosmian_crypto_base::CryptoBaseError;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum Error {
     #[error("Unknown partition {0}")]
     UnknownPartition(String),
     #[error("{0}")]
-    CryptoError(CryptoError),
+    CryptoError(CryptoBaseError),
     #[error("attribute not found: {0}")]
     AttributeNotFound(String),
     #[error("{} is missing{}",
@@ -94,13 +94,13 @@ impl From<ParseIntError> for Error {
     }
 }
 
-impl From<cosmian_crypto_base::Error> for Error {
-    fn from(e: cosmian_crypto_base::Error) -> Self {
+impl From<CryptoBaseError> for Error {
+    fn from(e: CryptoBaseError) -> Self {
         match e {
-            CryptoError::SizeError { given, expected } => {
+            CryptoBaseError::SizeError { given, expected } => {
                 Error::InvalidSize(format!("expected: {}, given: {}", expected, given))
             }
-            CryptoError::InvalidSize(e) => Error::InvalidSize(e),
+            CryptoBaseError::InvalidSize(e) => Error::InvalidSize(e),
             e => Error::CryptoError(e),
         }
     }

src/interfaces/ffi/hybrid_cc_aes.rs

@@ -748,7 +748,7 @@ pub unsafe extern "C" fn h_aes_encrypt_block(
     let data = std::slice::from_raw_parts(data_ptr as *const u8, data_len as usize).to_vec();
 
     let symmetric_key = ffi_unwrap!(<Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        symmetric_key
+        &symmetric_key.to_vec()
     ));
     let encrypted_block = ffi_unwrap!(encrypt_hybrid_block::<
         X25519Crypto,
@@ -823,7 +823,7 @@ pub unsafe extern "C" fn h_aes_decrypt_block(
     .to_vec();
 
     let symmetric_key = ffi_unwrap!(<Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        symmetric_key
+        &symmetric_key.to_vec()
     ));
     let encrypted_block = ffi_unwrap!(decrypt_hybrid_block::<
         X25519Crypto,

src/interfaces/ffi/tests.rs

@@ -66,8 +66,7 @@ unsafe fn encrypt_header(
     ))?;
 
     let symmetric_key_ = <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize)
-            .to_vec(),
+        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize),
     )
     .map_err(|e| Error::Other(e.to_string()))?;
 
@@ -121,8 +120,7 @@ unsafe fn decrypt_header(
     ))?;
 
     let symmetric_key_ = <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize)
-            .to_vec(),
+        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize),
     )
     .map_err(|e| Error::Other(e.to_string()))?;
 
@@ -275,8 +273,7 @@ unsafe fn encrypt_header_using_cache(
     ))?;
 
     let symmetric_key_ = <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize)
-            .to_vec(),
+        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize),
     )
     .map_err(|e| Error::Other(e.to_string()))?;
 
@@ -335,8 +332,7 @@ unsafe fn decrypt_header_using_cache(
     ))?;
 
     let symmetric_key_ = <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(
-        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize)
-            .to_vec(),
+        std::slice::from_raw_parts(symmetric_key_ptr as *const u8, symmetric_key_len as usize),
     )
     .map_err(|e| Error::Other(e.to_string()))?;
 

src/interfaces/pyo3/hybrid_cc_aes.rs

@@ -137,7 +137,7 @@ pub fn encrypt_hybrid_block(
     //
     // Parse symmetric key
     let symmetric_key =
-        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(symmetric_key_bytes)
+        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(&symmetric_key_bytes)
             .map_err(|e| PyTypeError::new_err(format!("Deserialize symmetric key failed: {e}")))?;
 
     //
@@ -168,7 +168,7 @@ pub fn decrypt_hybrid_block(
     //
     // Parse symmetric key
     let symmetric_key =
-        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(symmetric_key_bytes)
+        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(&symmetric_key_bytes)
             .map_err(|e| PyTypeError::new_err(format!("Deserialize symmetric key failed: {e}")))?;
 
     //

src/interfaces/statics.rs

@@ -80,7 +80,7 @@ pub fn encrypt_hybrid_header<KEM: Kem, DEM: Dem>(
     }
 
     Ok(EncryptedHeader {
-        symmetric_key: DEM::Key::try_from_bytes(secret_key.into()).map_err(Error::CryptoError)?,
+        symmetric_key: DEM::Key::try_from_bytes(&secret_key).map_err(Error::CryptoError)?,
         header_bytes,
     })
 }
@@ -128,7 +128,7 @@ pub fn decrypt_hybrid_header<KEM: Kem, DEM: Dem>(
     };
 
     Ok(ClearTextHeader {
-        symmetric_key: DEM::Key::try_from_bytes(secret_key.into()).map_err(Error::CryptoError)?,
+        symmetric_key: DEM::Key::try_from_bytes(&secret_key).map_err(Error::CryptoError)?,
         meta_data,
     })
 }

src/interfaces/wasm_bindgen/hybrid_cc_aes.rs

@@ -135,7 +135,7 @@ pub fn webassembly_encrypt_hybrid_block(
     //
     // Parse symmetric key
     let symmetric_key =
-        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(symmetric_key_bytes.to_vec())
+        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(&symmetric_key_bytes.to_vec())
             .map_err(|e| {
                 JsValue::from_str(&format!(
                     "Error parsing
@@ -186,7 +186,7 @@ pub fn webassembly_decrypt_hybrid_block(
     //
     // Parse symmetric key
     let symmetric_key =
-        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(symmetric_key_bytes.to_vec())
+        <Aes256GcmCrypto as SymmetricCrypto>::Key::try_from_bytes(&symmetric_key_bytes.to_vec())
             .map_err(|e| {
                 JsValue::from_str(&format!(
                     "Error parsing