wip

synrc · Oct 25, 2024 · 2a32417 · 2a32417
1 parent 7000913
commit 2a32417
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/lib/curves/curve.ex → lib/agreement/EC/curve.ex b/lib/curves/curve.ex → lib/agreement/EC/curve.ex
diff --git a/lib/curves/integer.ex → lib/agreement/EC/integer.ex b/lib/curves/integer.ex → lib/agreement/EC/integer.ex
diff --git a/lib/curves/math.ex → lib/agreement/EC/jacobian.ex b/lib/curves/math.ex → lib/agreement/EC/jacobian.ex
diff --git a/lib/curves/point.ex → lib/agreement/EC/point.ex b/lib/curves/point.ex → lib/agreement/EC/point.ex
diff --git a/lib/agreement/GF/.gitignore b/lib/agreement/GF/.gitignore
diff --git a/lib/agreement/ML/.gitignore b/lib/agreement/ML/.gitignore
diff --git a/lib/agreement/RSA/.gitignore b/lib/agreement/RSA/.gitignore
diff --git a/lib/curves/knownCurves.ex → lib/agreement/ecc.ex b/lib/curves/knownCurves.ex → lib/agreement/ecc.ex
diff --git a/lib/signing/ecdsa.ex b/lib/signing/ecdsa.ex
@@ -4,6 +4,12 @@ defmodule CA.ECDSA do
   require CA.Jacobian
   @moduledoc "CA/ECDSA ECC Signature (SYNRC)."
 
+  def decode_integer(bin) do
+      len = :erlang.size(bin)
+      <<int::size(len)-big-integer-signed-unit(8)>> = bin
+      int
+  end
+
   def sign(message, privateKey, options) do
       %{hashfunc: hashfunc} = Enum.into(options, %{hashfunc: :sha256})
       number = :crypto.hash(hashfunc, message) |> numberFromString()
@@ -37,9 +43,8 @@ defmodule CA.ECDSA do
 
   def signature(name) do
       {:ok, sig} = :file.read_file name
-      {{_,[{_,r},{_,s}]},""} = :asn1rt_nif.decode_ber_tlv sig
-      { :ca_enroll.decode_integer(r),
-        :ca_enroll.decode_integer(s) }
+      {:ok, {:"ECDSA-Sig-Value",r,s}}  =:"PKIXAlgs-2009".decode(:"ECDSA-Sig-Value", sig)
+      {r, s}
   end
 
   def sign(file, key) do

diff --git a/src/ca_enroll.erl b/src/ca_enroll.erl
@@ -1,12 +1,7 @@
 -module(ca_enroll).
 -copyright('Namdak Tonpa').
 -include_lib("public_key/include/public_key.hrl").
--export([init/2, boot/0, boot/1, cwd/0, ca/1, enroll/3, service/3, maybe_service/3, echo/2, decode_integer/1]).
-
-decode_integer(Bin) ->
-    Len = byte_size(Bin),
-    <<Int:Len/signed-unit:8>> = Bin,
-    Int.
+-export([init/2, boot/0, boot/1, cwd/0, ca/1, enroll/3, service/3, maybe_service/3, echo/2]).
 
 init(Req,Opts) ->
     Method  = cowboy_req:method(Req),