From 40001c4ff75d3eaaf96981ec1d5761d9e90e7afd Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Sun, 14 Jan 2018 14:29:13 +0000 Subject: [PATCH 1/2] Remove unused import --- src/Crypto/Spake2/Groups/Ed25519.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Crypto/Spake2/Groups/Ed25519.hs b/src/Crypto/Spake2/Groups/Ed25519.hs index c8e48c9..a1b6049 100644 --- a/src/Crypto/Spake2/Groups/Ed25519.hs +++ b/src/Crypto/Spake2/Groups/Ed25519.hs @@ -18,7 +18,7 @@ module Crypto.Spake2.Groups.Ed25519 , generator ) where -import Protolude hiding (group, zero) +import Protolude hiding (group) import Crypto.Error (CryptoFailable(..), CryptoError(..)) import Crypto.Number.Generate (generateMax) From 416e7c2ef0ca080a98e9ea2c8af9e5965c1c3986 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Sun, 14 Jan 2018 14:30:24 +0000 Subject: [PATCH 2/2] Remove unproven shortcut from `safeScalarMultiply` --- src/Crypto/Spake2/Groups/Ed25519.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Crypto/Spake2/Groups/Ed25519.hs b/src/Crypto/Spake2/Groups/Ed25519.hs index a1b6049..93ae6e9 100644 --- a/src/Crypto/Spake2/Groups/Ed25519.hs +++ b/src/Crypto/Spake2/Groups/Ed25519.hs @@ -301,7 +301,6 @@ safeScalarMultiply n = scalarMultiplyExtendedPoint addExtendedPoints n scalarMultiplyExtendedPoint :: (ExtendedPoint a -> ExtendedPoint a -> ExtendedPoint a) -> Integer -> ExtendedPoint a -> ExtendedPoint a scalarMultiplyExtendedPoint _ 0 _ = extendedZero scalarMultiplyExtendedPoint add n x - | n >= l = scalarMultiplyExtendedPoint add (n `mod` l) x | even n = doubleExtendedPoint (scalarMultiplyExtendedPoint add (n `div` 2) x) | n == 1 = x | n <= 0 = panic $ "Unexpected negative multiplier: " <> show n