schnorr_sig 1.0.0.2 → 1.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07355d7c8e4e0ce43bd586ba7cea831b72d2fd40b6c2efa1d49c46c536ab3ab
-  data.tar.gz: 346f2e23f326259d0e86f0837377e03cef56518b31828b22d3f7fa7ddca8b76b
+  metadata.gz: 583aef17bbda178fd790a7cfddb29bdd1d38ee1d44092d3cb6afc2517a564a09
+  data.tar.gz: 299a66f0e042c200b81f902e23ab2adb712a6260532fb28a6e23555cfc414db6
 SHA512:
-  metadata.gz: f91e124755a889779f7b5bda0991f9cd082078c855a5f8bcf2fe30886b779d5033d712801d776558bc454a5e5ba1a219fbd05f66b77dfd53098551dc7d6462e1
-  data.tar.gz: 7709c7e780d437dce791ac7f959350b71622c05c9838cdd6f5173fef3f232ace1a2e4b258ba56f697c4025266fab6e7b8ab0e0f6a77358d07880412963ae717f
+  metadata.gz: bb3a7ade41fcdd713ae0b9da0d8c0cf8c390f7c3da232e19e4be146f66bf45311aa19ab02025ff3b55e5dc11a000094817751aaf4dd2c4a9d7e9f93b455ff866
+  data.tar.gz: 0dd87d6af1595d3a51b4d1788bb3b24f3c1a11a0997ceb3fc0543e422b4dde75fa04e2b3f1ca4ec5cdafe3fbd9f23091c23cd9608e9ea338e7a21f5b515a6dcf

data/VERSION

@@ -1 +1 @@
-1.0.0.2
+1.0.1.1

data/lib/schnorr_sig/fast.rb

@@ -34,11 +34,10 @@ module SchnorrSig
     # Output
     #   Secp256k1::KeyPair
     def keypair_obj(sk = nil)
-      if sk
-        binary!(sk, KEY)
-        CONTEXT.key_pair_from_private_key(sk)
-      else
+      if sk.nil?
         CONTEXT.generate_key_pair
+      else
+        CONTEXT.key_pair_from_private_key(binary!(sk, KEY))
       end
     end
 
@@ -69,8 +68,7 @@ module SchnorrSig
     # Output
     #   Secp256k1::SchnorrSignature
     def signature(str)
-      binary!(str, SIG)
-      Secp256k1::SchnorrSignature.from_data(str)
+      Secp256k1::SchnorrSignature.from_data(binary!(str, SIG))
     end
 
     # Input
@@ -78,10 +76,8 @@ module SchnorrSig
     #   The message, m:     32 byte hash value
     # Output
     #   64 bytes binary
-    def sign(sk, m)
-      binary!(sk, KEY) and binary!(m, 32)
-      CONTEXT.sign_schnorr(keypair_obj(sk), m).serialized
-    end
+    def sign(sk, m) = CONTEXT.sign_schnorr(keypair_obj(sk),
+                                           binary!(m, 32)).serialized
 
     # Input
     #   The public key, pk: 32 bytes binary
@@ -112,10 +108,7 @@ module SchnorrSig
     #   msg: UTF-8 / binary / agnostic
     # Output
     #   32 bytes binary
-    def tagged_hash(tag, msg)
-      check!(tag, String) and check!(msg, String)
-      CONTEXT.tagged_sha256(tag, msg)
-    end
+    def tagged_hash(tag, msg) = CONTEXT.tagged_sha256(str!(tag), str!(msg))
   end
 
   Fast.include Utils

data/lib/schnorr_sig/pure.rb

@@ -87,15 +87,12 @@ module SchnorrSig
     # Output
     #   32 bytes binary
     def tagged_hash(tag, msg)
-      check!(tag, String) and check!(msg, String)
-      warn("tag expected to be UTF-8") unless tag.encoding == Encoding::UTF_8
-
       # BIP340: The function hash[name](x) where x is a byte array
       #         returns the 32-byte hash
       #         SHA256(SHA256(tag) || SHA256(tag) || x)
       #         where tag is the UTF-8 encoding of name.
-      tag_hash = Digest::SHA256.digest(tag)
-      Digest::SHA256.digest(tag_hash + tag_hash + msg)
+      tag_hash = Digest::SHA256.digest tag
+      Digest::SHA256.digest(tag_hash + tag_hash + str!(msg).b)
     end
 
     #
@@ -135,7 +132,7 @@ module SchnorrSig
     #   The signature, sig:       64 bytes binary
     def sign(sk, m, auxrand: nil)
       a = auxrand.nil? ? random_bytes(B) : auxrand
-      binary!(sk, KEY) and check!(m, String) and binary!(a, B)
+      binary!(sk, KEY) and str!(m) and binary!(a, B)
 
       # BIP340: Let d' = int(sk)
       # BIP340: Fail if d' = 0 or d' >= n
@@ -186,7 +183,7 @@ module SchnorrSig
     # Output
     #   Boolean
     def verify?(pk, m, sig)
-      binary!(pk, KEY) and check!(m, String) and binary!(sig, SIG)
+      binary!(pk, KEY) and str!(m) and binary!(sig, SIG)
 
       # BIP340: Let P = lift_x(int(pk))
       p = lift_x(int(pk))

data/lib/schnorr_sig/utils.rb

@@ -11,13 +11,19 @@ module SchnorrSig
       val.is_a?(cls) ? val : raise(SpecError, "#{cls}: #{val.inspect}")
     end
 
+    # raise SpecError or return str
+    def str!(str, length = nil)
+      if check!(str, String) and !length.nil? and length != str.length
+        raise(SpecError, "Length #{str.length} should be #{length}")
+      end
+      str
+    end
+
     # raise SpecError or return str
     def binary!(str, length)
-      check!(str, String)
-      if str.encoding != Encoding::BINARY
+      if str!(str, length).encoding != Encoding::BINARY
         raise(SpecError, "Encoding: #{str.encoding}")
       end
-      raise(SpecError, "Length: #{str.length}") if str.length != length
       str
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schnorr_sig
 version: !ruby/object:Gem::Version
-  version: 1.0.0.2
+  version: 1.0.1.1
 platform: ruby
 authors:
 - Rick Hull