haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply hlint suggestions

Browse Source
This commit is contained in:
Olivier Chéron 2019-09-28 17:45:16 +02:00
parent db8d47a76c
commit 6f2a59e470
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Crypto/ECC.hs
View File

@ -166,11 +166,11 @@ instance EllipticCurve Curve_P256R1 where
uncompressed = B.singleton 4 uncompressed = B.singleton 4
xy = P256.pointToBinary p xy = P256.pointToBinary p
decodePoint _ mxy = case B.uncons mxy of decodePoint _ mxy = case B.uncons mxy of
Nothing -> CryptoFailed $ CryptoError_PointSizeInvalid Nothing -> CryptoFailed CryptoError_PointSizeInvalid
Just (m,xy) Just (m,xy)
-- uncompressed -- uncompressed
| m == 4 -> P256.pointFromBinary xy | m == 4 -> P256.pointFromBinary xy
| otherwise -> CryptoFailed $ CryptoError_PointFormatInvalid | otherwise -> CryptoFailed CryptoError_PointFormatInvalid
instance EllipticCurveArith Curve_P256R1 where instance EllipticCurveArith Curve_P256R1 where
pointAdd _ a b = P256.pointAdd a b pointAdd _ a b = P256.pointAdd a b
@ -353,7 +353,7 @@ encodeECPoint (Simple.Point x y) = B.concat [uncompressed,xb,yb]
decodeECPoint :: (Simple.Curve curve, ByteArray bs) => bs -> CryptoFailable (Simple.Point curve) decodeECPoint :: (Simple.Curve curve, ByteArray bs) => bs -> CryptoFailable (Simple.Point curve)
decodeECPoint mxy = case B.uncons mxy of decodeECPoint mxy = case B.uncons mxy of
Nothing -> CryptoFailed $ CryptoError_PointSizeInvalid Nothing -> CryptoFailed CryptoError_PointSizeInvalid
Just (m,xy) Just (m,xy)
-- uncompressed -- uncompressed
| m == 4 -> | m == 4 ->
@ -362,7 +362,7 @@ decodeECPoint mxy = case B.uncons mxy of
x = os2ip xb x = os2ip xb
y = os2ip yb y = os2ip yb
in Simple.pointFromIntegers (x,y) in Simple.pointFromIntegers (x,y)
| otherwise -> CryptoFailed $ CryptoError_PointFormatInvalid | otherwise -> CryptoFailed CryptoError_PointFormatInvalid
ecPointsMulVarTime :: forall curve . Simple.Curve curve ecPointsMulVarTime :: forall curve . Simple.Curve curve
=> Simple.Scalar curve => Simple.Scalar curve

8
Crypto/PubKey/ECC/P256.hs
View File

@ -110,7 +110,7 @@ pointAdd a b = withNewPoint $ \dx dy ->
-- | Negate a point -- | Negate a point
pointNegate :: Point -> Point pointNegate :: Point -> Point
pointNegate a = withNewPoint $ \dx dy -> pointNegate a = withNewPoint $ \dx dy ->
withPoint a $ \ax ay -> do withPoint a $ \ax ay ->
ccryptonite_p256e_point_negate ax ay dx dy ccryptonite_p256e_point_negate ax ay dx dy
-- | Multiply a point by a scalar -- | Multiply a point by a scalar
@ -188,12 +188,12 @@ pointFromBinary ba = unsafePointFromBinary ba >>= validatePoint
validatePoint :: Point -> CryptoFailable Point validatePoint :: Point -> CryptoFailable Point
validatePoint p validatePoint p
| pointIsValid p = CryptoPassed p | pointIsValid p = CryptoPassed p
| otherwise = CryptoFailed $ CryptoError_PointCoordinatesInvalid | otherwise = CryptoFailed CryptoError_PointCoordinatesInvalid
-- | Convert from binary to a point, possibly invalid -- | Convert from binary to a point, possibly invalid
unsafePointFromBinary :: ByteArrayAccess ba => ba -> CryptoFailable Point unsafePointFromBinary :: ByteArrayAccess ba => ba -> CryptoFailable Point
unsafePointFromBinary ba unsafePointFromBinary ba
| B.length ba /= pointSize = CryptoFailed $ CryptoError_PublicKeySizeInvalid | B.length ba /= pointSize = CryptoFailed CryptoError_PublicKeySizeInvalid
| otherwise = | otherwise =
CryptoPassed $ withNewPoint $ \px py -> B.withByteArray ba $ \src -> do CryptoPassed $ withNewPoint $ \px py -> B.withByteArray ba $ \src -> do
ccryptonite_p256_from_bin src (castPtr px) ccryptonite_p256_from_bin src (castPtr px)
@ -266,7 +266,7 @@ scalarCmp a b = unsafeDoIO $
-- | convert a scalar from binary -- | convert a scalar from binary
scalarFromBinary :: ByteArrayAccess ba => ba -> CryptoFailable Scalar scalarFromBinary :: ByteArrayAccess ba => ba -> CryptoFailable Scalar
scalarFromBinary ba scalarFromBinary ba
| B.length ba /= scalarSize = CryptoFailed $ CryptoError_SecretKeySizeInvalid | B.length ba /= scalarSize = CryptoFailed CryptoError_SecretKeySizeInvalid
| otherwise = | otherwise =
CryptoPassed $ withNewScalarFreeze $ \p -> B.withByteArray ba $ \b -> CryptoPassed $ withNewScalarFreeze $ \p -> B.withByteArray ba $ \b ->
ccryptonite_p256_from_bin b p ccryptonite_p256_from_bin b p

2
tests/ECC.hs
View File

@ -293,7 +293,7 @@ tests = testGroup "ECC"
[ testGroup "decodePoint" $ map doPointDecodeTest (zip [katZero..] vectorsPoint) [ testGroup "decodePoint" $ map doPointDecodeTest (zip [katZero..] vectorsPoint)
, testGroup "ECDH weak points" $ map doWeakPointECDHTest (zip [katZero..] vectorsWeakPoint) , testGroup "ECDH weak points" $ map doWeakPointECDHTest (zip [katZero..] vectorsWeakPoint)
, testGroup "property" , testGroup "property"
[ testProperty "decodePoint.encodePoint==id" $ \testDRG (Curve curve) -> do [ testProperty "decodePoint.encodePoint==id" $ \testDRG (Curve curve) ->
let prx = Just curve -- using Maybe as Proxy let prx = Just curve -- using Maybe as Proxy
keyPair = withTestDRG testDRG $ ECC.curveGenerateKeyPair prx keyPair = withTestDRG testDRG $ ECC.curveGenerateKeyPair prx
p1 = ECC.keypairGetPublic keyPair p1 = ECC.keypairGetPublic keyPair

10
tests/KAT_PubKey/P256.hs
View File

@ -122,10 +122,10 @@ tests = testGroup "P256"
t = P256.pointFromIntegers (xT, yT) t = P256.pointFromIntegers (xT, yT)
r = P256.pointFromIntegers (xR, yR) r = P256.pointFromIntegers (xR, yR)
in r @=? P256.pointAdd s t in r @=? P256.pointAdd s t
, testProperty "lift-to-curve" $ propertyLiftToCurve , testProperty "lift-to-curve" propertyLiftToCurve
, testProperty "point-add" $ propertyPointAdd , testProperty "point-add" propertyPointAdd
, testProperty "point-negate" $ propertyPointNegate , testProperty "point-negate" propertyPointNegate
, testProperty "point-mul" $ propertyPointMul , testProperty "point-mul" propertyPointMul
] ]
] ]
where where
@ -154,7 +154,7 @@ tests = testGroup "P256"
let p = P256.toPoint (unP256Scalar r) let p = P256.toPoint (unP256Scalar r)
pe = ECC.pointMul curve (unP256 r) curveGen pe = ECC.pointMul curve (unP256 r) curveGen
pR = P256.pointNegate p pR = P256.pointNegate p
in ECC.pointNegate curve pe `propertyEq` (pointP256ToECC pR) in ECC.pointNegate curve pe `propertyEq` pointP256ToECC pR
propertyPointMul s' r' = propertyPointMul s' r' =
let s = modP256Scalar s' let s = modP256Scalar s'