From 0a9ea7ac1df07363af0fda723e313e775563b9f4 Mon Sep 17 00:00:00 2001 From: arnaucube Date: Fri, 27 Dec 2024 16:01:39 +0100 Subject: [PATCH] wip2 --- src/eddsa.rs | 5 +++-- src/signature.rs | 13 ++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/eddsa.rs b/src/eddsa.rs index 08c62f1..295fb4c 100644 --- a/src/eddsa.rs +++ b/src/eddsa.rs @@ -4,8 +4,9 @@ use ark_crypto_primitives::sponge::{ Absorb, CryptographicSponge, }; use ark_ec::{ - twisted_edwards::{Affine, TECurveConfig}, - AffineRepr, CurveGroup, + // twisted_edwards::{Affine, TECurveConfig}, + AffineRepr, + CurveGroup, }; use ark_ff::{BigInteger, PrimeField}; use ark_serialize::{CanonicalDeserialize, CanonicalSerialize}; diff --git a/src/signature.rs b/src/signature.rs index 7d414be..61377b2 100644 --- a/src/signature.rs +++ b/src/signature.rs @@ -1,8 +1,5 @@ -use ark_ec::twisted_edwards::Affine; -use ark_ec::twisted_edwards::TECurveConfig; -use ark_ec::CurveGroup; -use ark_serialize::CanonicalDeserialize; -use ark_serialize::CanonicalSerialize; +use ark_ec::{AffineRepr, CurveGroup}; +use ark_serialize::{CanonicalDeserialize, CanonicalSerialize}; /// `SignatureComponents` contains the realized parts of a signature #[derive(Copy, Clone, Debug, PartialEq, CanonicalSerialize, CanonicalDeserialize)] @@ -12,7 +9,6 @@ pub struct Signature { } impl Signature { - /* /// Serializes the signature components to bytes as uncompressed. /// Expect output size to be `size_of(C::BaseField) * 2 + size_of(C::ScalarField)` pub fn to_bytes(&self) -> Vec { @@ -25,8 +21,8 @@ impl Signature { /// Checked deserialization of the signature components from bytes. /// Expects input size to be `size_of(C::BaseField) * 2 + size_of(C::ScalarField)` pub fn from_bytes(bytes: &[u8]) -> Result> { - let point_size = C::Affine::Config::serialized_size(ark_serialize::Compress::No); - (bytes.len() == 32 + C::Affine::Config::serialized_size(ark_serialize::Compress::No)) + let point_size = C::Affine::generator().serialized_size(ark_serialize::Compress::No); + (bytes.len() == 32 + point_size) .then_some(true) .ok_or(ark_serialize::SerializationError::InvalidData)?; @@ -37,7 +33,6 @@ impl Signature { let s = C::ScalarField::deserialize_uncompressed(&bytes[off1..off2])?; Ok(Signature { r, s }) } - */ pub fn new(r: C::Affine, s: C::ScalarField) -> Self { Self { r, s }