From b4e59cc60e55701df9962de9fe50f34f0b646311 Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Tue, 6 Jul 2021 14:32:04 +0200
Subject: [PATCH] Change `Group::hash_to_curve` to return `Result`

---
 src/group.rs        | 6 +++---
 src/map_to_curve.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/group.rs b/src/group.rs
index 6b3c9ec..00203b9 100644
--- a/src/group.rs
+++ b/src/group.rs
@@ -58,7 +58,7 @@ pub trait Group: Copy + Sized + for<'a> Mul<&'a <Self as Group>::Scalar, Output
     type UniformBytesLen: ArrayLength<u8>;
 
     /// Hashes a slice of pseudo-random bytes of the correct length to a curve point
-    fn hash_to_curve(uniform_bytes: &GenericArray<u8, Self::UniformBytesLen>) -> Self;
+    fn hash_to_curve(uniform_bytes: &GenericArray<u8, Self::UniformBytesLen>) -> Result<Self, InternalPakeError>;
 
     /// Get the base point for the group
     fn base_point() -> Self;
@@ -128,14 +128,14 @@ impl Group for RistrettoPoint {
     }
 
     type UniformBytesLen = U64;
-    fn hash_to_curve(uniform_bytes: &GenericArray<u8, Self::UniformBytesLen>) -> Self {
+    fn hash_to_curve(uniform_bytes: &GenericArray<u8, Self::UniformBytesLen>) -> Result<Self, InternalPakeError> {
         // https://caniuse.rs/features/array_gt_32_impls
         let bits: [u8; 64] = {
             let mut bytes = [0u8; 64];
             bytes.copy_from_slice(uniform_bytes);
             bytes
         };
-        RistrettoPoint::from_uniform_bytes(&bits)
+        Ok(RistrettoPoint::from_uniform_bytes(&bits))
     }
 
     fn base_point() -> Self {
diff --git a/src/map_to_curve.rs b/src/map_to_curve.rs
index 8854844..04e0bdf 100644
--- a/src/map_to_curve.rs
+++ b/src/map_to_curve.rs
@@ -43,9 +43,9 @@ impl GroupWithMapToCurve for RistrettoPoint {
     fn map_to_curve<H: Hash>(msg: &[u8], dst: &[u8]) -> Result<Self, InternalPakeError> {
         let uniform_bytes =
             expand_message_xmd::<H>(msg, dst, <H as Digest>::OutputSize::to_usize())?;
-        Ok(<Self as Group>::hash_to_curve(
+        <Self as Group>::hash_to_curve(
             &GenericArray::clone_from_slice(&uniform_bytes[..]),
-        ))
+        )
     }
 
     fn hash_to_scalar<H: Hash>(