implement error conversions

Author: wysiwys

ecdsa/src/impl_signature_trait.rs

@@ -1,3 +1,5 @@
+use libcrux_traits::signature::arrayref;
+
 macro_rules! impl_signature_trait {
     ($digest_alg_name:ident, $pk_len:literal, $sk_len:literal, $sig_len:literal, $alias:ident) => {
         #[allow(non_camel_case_types)]
@@ -17,7 +19,7 @@ macro_rules! impl_signature_trait {
                     nonce,
                     signature,
                 )
-                .map_err(|_| todo!())
+                .map_err(|_| arrayref::SignError::LibraryError)
             }
         }
         impl arrayref::Verify<&(), $pk_len, $sig_len> for $alias {
@@ -35,7 +37,11 @@ macro_rules! impl_signature_trait {
                     <&[u8; 32]>::try_from(&signature[32..]).unwrap(),
                     public_key,
                 )
-                .map_err(|_| todo!())
+                .map_err(|e| match e {
+                    crate::Error::InvalidSignature => arrayref::VerifyError::InvalidSignature,
+                    _ => arrayref::VerifyError::LibraryError,
+
+                })
             }
         }
         libcrux_traits::impl_signature_slice_trait!($alias => $sk_len, $sig_len, &Nonce, nonce);
@@ -46,8 +52,9 @@ macro_rules! impl_signature_trait {
 
 pub mod p256 {
 
+    use super::*;
+
     use crate::p256::Nonce;
-    use libcrux_traits::signature::arrayref;
     pub struct Signer<T> {
         _phantom_data: core::marker::PhantomData<T>,
     }

libcrux-ml-dsa/src/impl_signature_trait.rs

@@ -1,20 +1,26 @@
-use libcrux_traits::signature::{arrayref, owned};
+use libcrux_traits::signature::arrayref;
 
-impl From<crate::SigningError> for owned::SignError {
+impl From<crate::SigningError> for arrayref::SignError {
     fn from(e: crate::SigningError) -> Self {
         match e {
-            crate::SigningError::RejectionSamplingError => todo!(),
-            crate::SigningError::ContextTooLongError => todo!(),
+            crate::SigningError::RejectionSamplingError => arrayref::SignError::LibraryError,
+            crate::SigningError::ContextTooLongError => arrayref::SignError::LibraryError,
         }
     }
 }
 impl From<crate::VerificationError> for arrayref::VerifyError {
     fn from(e: crate::VerificationError) -> Self {
         match e {
-            crate::VerificationError::MalformedHintError => todo!(),
-            crate::VerificationError::SignerResponseExceedsBoundError => todo!(),
-            crate::VerificationError::CommitmentHashesDontMatchError => todo!(),
-            crate::VerificationError::VerificationContextTooLongError => todo!(),
+            crate::VerificationError::MalformedHintError => arrayref::VerifyError::LibraryError,
+            crate::VerificationError::SignerResponseExceedsBoundError => {
+                arrayref::VerifyError::LibraryError
+            }
+            crate::VerificationError::CommitmentHashesDontMatchError => {
+                arrayref::VerifyError::LibraryError
+            }
+            crate::VerificationError::VerificationContextTooLongError => {
+                arrayref::VerifyError::LibraryError
+            }
         }
     }
 }

rsa/src/impl_signature_trait.rs

@@ -28,7 +28,12 @@ macro_rules! impl_signature_trait {
                     salt,
                     signature,
                 )
-                .map_err(|_| todo!())
+                .map_err(|e| match e {
+                    // TODO: is this correct?
+                    crate::Error::MessageTooLarge => arrayref::SignError::InvalidPayloadLength,
+                    _ => arrayref::SignError::LibraryError,
+
+                })
             }
         }
         impl arrayref::Verify<u32, $bytes, $bytes> for $alias {
@@ -45,7 +50,13 @@ macro_rules! impl_signature_trait {
                     salt_len,
                     signature,
                 )
-                .map_err(|_| todo!())
+                .map_err(|e| match e {
+                    // TODO: is this correct?
+                    crate::Error::InvalidSignatureLength => arrayref::VerifyError::InvalidSignature,
+                    crate::Error::MessageTooLarge => arrayref::VerifyError::InvalidPayloadLength,
+                    _ => arrayref::VerifyError::LibraryError,
+
+                })
             }
         }
 

traits/src/signature/arrayref.rs

@@ -20,12 +20,14 @@ pub trait Verify<VerifyAux, const PUBLIC_KEY_LEN: usize, const SIGNATURE_LEN: us
 #[derive(Debug, PartialEq, Eq)]
 pub enum SignError {
     InvalidPayloadLength,
+    LibraryError,
 }
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum VerifyError {
     InvalidSignature,
     InvalidPayloadLength,
+    LibraryError,
 }
 
 // No auxiliary information

traits/src/signature/slice.rs

@@ -39,6 +39,7 @@ pub enum SignError {
     InvalidPrivateKeyLength,
     InvalidSignatureBufferLength,
     InvalidPayloadLength,
+    LibraryError,
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -47,12 +48,14 @@ pub enum VerifyError {
     InvalidPublicKeyLength,
     InvalidSignatureBufferLength,
     InvalidSignature,
+    LibraryError,
 }
 
 impl From<super::arrayref::SignError> for SignError {
     fn from(e: super::arrayref::SignError) -> Self {
         match e {
             super::arrayref::SignError::InvalidPayloadLength => Self::InvalidPayloadLength,
+            super::arrayref::SignError::LibraryError => Self::LibraryError,
         }
     }
 }
@@ -61,6 +64,7 @@ impl From<super::arrayref::VerifyError> for VerifyError {
         match e {
             super::arrayref::VerifyError::InvalidSignature => Self::InvalidSignature,
             super::arrayref::VerifyError::InvalidPayloadLength => Self::InvalidPayloadLength,
+            super::arrayref::VerifyError::LibraryError => Self::LibraryError,
         }
     }
 }