Length check for scalarFromBS

IntersectMBO · Nov 29, 2022 · 43cba76 · 43cba76
1 parent 7db675f
commit 43cba76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cardano-crypto-class/src/Cardano/Crypto/EllipticCurve/BLS12_381/Internal.hs b/cardano-crypto-class/src/Cardano/Crypto/EllipticCurve/BLS12_381/Internal.hs
@@ -809,7 +809,10 @@ scalarFromBS bs =
     (success, scalar) = unsafePerformIO $
       withNewScalar $ \scalarPtr ->
         BS.useAsCStringLen bs $ \(cstr, l) ->
-          c_blst_scalar_from_be_bytes scalarPtr cstr (fromIntegral l)
+          if l == 32 then
+            c_blst_scalar_from_be_bytes scalarPtr cstr (fromIntegral l)
+          else
+            return False
 
 scalarToBS :: Scalar -> ByteString
 scalarToBS scalar = unsafePerformIO $ do

diff --git a/cardano-crypto-tests/src/Test/Crypto/EllipticCurve.hs b/cardano-crypto-tests/src/Test/Crypto/EllipticCurve.hs
@@ -66,7 +66,7 @@ testScalar name =
     , testProperty "to/from Integer round-trip" $
         \s -> s === ((unsafePerformIO . BLS.scalarFromInteger) . (unsafePerformIO . BLS.scalarToInteger) $ s)
     , testCase "integer from scalar" $ do
-        s <- case BLS.scalarFromBS (BS.pack [0x12, 0x34]) of
+        s <- case BLS.scalarFromBS (BLS.padBS 32 (BS.pack [0x12, 0x34])) of
               Left err -> error (show err)
               Right x -> return x
         let expected = 0x1234

diff --git a/cardano-crypto-tests/test/Main.hs b/cardano-crypto-tests/test/Main.hs
@@ -27,9 +27,6 @@ tests =
       , Test.Crypto.KES.tests
       , Test.Crypto.VRF.tests
       , Test.Crypto.Regressions.tests
-<<<<<<< HEAD
       , Test.Crypto.Vector.Secp256k1DSIGN.tests
-=======
       , Test.Crypto.EllipticCurve.tests
->>>>>>> 8c57190 (BLS12-381 bindings)
       ]