fixing convert methods

PeaceFounder · Oct 31, 2024 · 67eaa55 · 67eaa55 · JanisErdmanis · Oct 31, 2024
1 parent c7a3f91
commit 67eaa55
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "CryptoGroups"
 uuid = "bc997328-bedd-407e-bcd3-5758e064a52d"
 authors = ["Janis Erdmanis <janiserdmanis@protonmail.ch>"]
-version = "0.5.3"
+version = "0.5.4"
 
 [deps]
 CryptoPRG = "d846c407-34c1-46cb-aa27-d51818cc05e2"

diff --git a/src/Curves/conversions.jl b/src/Curves/conversions.jl
@@ -28,7 +28,9 @@ function decompress_weierstrass(x::BigInt, ỹ::Bool, (a, b)::Tuple{F, F}) where
 end
 
 
-function (::Type{P})(po::Vector{UInt8}) where P <: AbstractPoint
+#function (::Type{P})(po::Vector{UInt8}) where P <: AbstractPoint
+
+function Base.convert(::Type{P}, po::Vector{UInt8}) where P <: AbstractPoint
 
     pc = po[1]
 
@@ -129,6 +131,10 @@ end
 # This shall be considered internal as x, y can't be arbitrary!!!
 function _octet(x::BigInt, y::BigInt, N::Int; mode::Symbol = :uncompressed) # N is bitlength(modulus(field()))
 
+    if iszero(x) && iszero(y)
+        return UInt8[0]
+    end
+
     _x = int2octet(x, N)
     _y = int2octet(y, N)
 
@@ -162,6 +168,10 @@ _octet(x::F, y::F; mode::Symbol = :uncompressed) where F <: PrimeField = _octet(
 
 function _octet(x::F, y::F; mode::Symbol = :uncompressed) where F <: BinaryField
 
+    if iszero(x) && iszero(y)
+        return UInt8[0]
+    end
+
     _x = octet(x)
     _y = octet(y)
 
@@ -171,9 +181,6 @@ function _octet(x::F, y::F; mode::Symbol = :uncompressed) where F <: BinaryField
 
     elseif mode in [:compressed, :hybrid]
 
-        #x_ = F(reverse(x))
-        #y_ = F(reverse(y))
-
         if isstrict()
             @warn "Calculation of ỹ could be wrong due to insufficient tests."
         end

diff --git a/src/Curves/ecpoint.jl b/src/Curves/ecpoint.jl
@@ -98,6 +98,8 @@ struct ECPoint{P<:AbstractPoint, S} <: AbstractPoint # The same contract is sati
     ECPoint{P, S}(x::F, y::F) where {P <: AbstractPoint, S, F <: Field} = ECPoint{P, S}(P(x, y))
 end
 
+ECPoint{P, S}(x; allow_zero=false, skip_validation=false) where {P <: AbstractPoint, S} = ECPoint{P, S}(convert(P, x); allow_zero, skip_validation)
+
 """
     concretize_type(::Type{ECPoint{P}}, order::Integer, cofactor::Integer; name=nothing) where P <: AbstractPoint
 

diff --git a/src/groups.jl b/src/groups.jl
@@ -113,7 +113,7 @@ struct ECGroup{P<:ECPoint} <: Group
 end
 
 ECGroup{P}(x, y) where {P <: ECPoint} = ECGroup{P}(P(x, y))
-ECGroup{P}(x::Vector{UInt8}) where {P <: ECPoint} = ECGroup{P}(P(x))
+ECGroup{P}(x::Union{Vector{UInt8}, NTuple{2, <:Union{Integer, BitVector}}}; allow_one=false, skip_validation=false) where {P <: ECPoint} = ECGroup{P}(P(x; allow_zero=allow_one, skip_validation))
 
 
 """