acw/cryptonum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support unsigned integral square root computations.

Browse Source
This commit is contained in:
Adam Wick
2018-11-30 11:28:20 -08:00
parent 0ec5f90d8e
commit 2b9f5ea7a2
13 changed files with 13156 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
test-generator/Invocs.hs
View File

@@ -62,6 +62,7 @@ main = do
Mul -> hPutStrLn hndl ("multiply_impls!(U" ++ show size ++ ", U" ++ show (size * 2) ++ ");")
Shifts -> hPutStrLn hndl ("shift_impls!(U" ++ show size ++ ", " ++ show (size `div` 64) ++ ");")
Square -> hPutStrLn hndl ("square_impls!(U" ++ show size ++ ", U" ++ show (size * 2) ++ ", " ++ show size ++ ");")
SquareRoot -> hPutStrLn hndl ("sqrt_impls!(U" ++ show size ++ ");")
Sub -> hPutStrLn hndl ("subtraction_impls!(U" ++ show size ++ ", " ++ show (size `div` 64) ++ ");")
Convert to -> hPutStrLn hndl ("conversion_impls!(U" ++ show size ++ ", U" ++ show to ++ ");")
PrimeGen -> hPutStrLn hndl ("prime_gen_impls!(U" ++ show size ++ ");")
@@ -69,25 +70,26 @@ main = do
hPutStrLn hndl ""
hPutStrLn hndl "\n#[cfg(test)]"
hPutStrLn hndl "mod tests {"
generateTestBlock hndl "base" BaseOps True 16384 []
generateTestBlock hndl "conversion" BaseOps False 90000 []
generateTestBlock hndl "codec" BaseOps False 90000 []
generateTestBlock hndl "cmp" BaseOps True 16384 []
generateTestBlock hndl "sub" Sub True 9000 []
generateTestBlock hndl "shiftl" Shifts True 9000 []
generateTestBlock hndl "shiftr" Shifts True 9000 []
generateTestBlock hndl "add" Add True 9000 [(+ 64)]
generateTestBlock hndl "mul" Mul True 9000 [(* 2)]
generateTestBlock hndl "div" Div True 2049 []
generateTestBlock hndl "barrett_gen" Barretts True 2000 [(+ 64)]
generateTestBlock hndl "barrett_red" Barretts True 4000 [(+ 64), (* 2)]
generateTestBlock hndl "modsq" ModSq True 4000 []
generateTestBlock hndl "modmul" ModMul True 4000 []
generateTestBlock hndl "modexp" ModExp True 512 []
generateTestBlock hndl "square" Square True 4000 [(* 2)]
generateTestBlock hndl "barrett_modsq" ModSq True 4000 [(+ 64)]
generateTestBlock hndl "barrett_modmul" ModMul True 4000 [(+ 64)]
generateTestBlock hndl "barrett_modexp" ModExp True 1024 [(+ 64)]
generateTestBlock hndl "base" BaseOps True 16384 []
generateTestBlock hndl "conversion" BaseOps False 90000 []
generateTestBlock hndl "codec" BaseOps False 90000 []
generateTestBlock hndl "cmp" BaseOps True 16384 []
generateTestBlock hndl "sub" Sub True 9000 []
generateTestBlock hndl "shiftl" Shifts True 9000 []
generateTestBlock hndl "shiftr" Shifts True 9000 []
generateTestBlock hndl "add" Add True 9000 [(+ 64)]
generateTestBlock hndl "mul" Mul True 9000 [(* 2)]
generateTestBlock hndl "div" Div True 2049 []
generateTestBlock hndl "barrett_gen" Barretts True 2000 [(+ 64)]
generateTestBlock hndl "barrett_red" Barretts True 4000 [(+ 64), (* 2)]
generateTestBlock hndl "modsq" ModSq True 4000 []
generateTestBlock hndl "modmul" ModMul True 4000 []
generateTestBlock hndl "modexp" ModExp True 512 []
generateTestBlock hndl "square" Square True 4000 [(* 2)]
generateTestBlock hndl "sqrt" SquareRoot True 4096 []
generateTestBlock hndl "barrett_modsq" ModSq True 4000 [(+ 64)]
generateTestBlock hndl "barrett_modmul" ModMul True 4000 [(+ 64)]
generateTestBlock hndl "barrett_modexp" ModExp True 1024 [(+ 64)]
hPutStrLn hndl "}"
withFile "../src/signed/invoc.rs" WriteMode $ \ hndl ->
do forM_ requirements $ \ (Req size oper) ->

20
test-generator/Math.hs
View File

@@ -3,10 +3,12 @@ module Math(
extendedGCD
, barrett, computeK, base
, modulate, modulate'
, isqrt
, showX, showB
)
where
import Data.Bits(shiftL,shiftR)
import Numeric(showHex)
data AlgState = AlgState {
@@ -102,6 +104,24 @@ showB :: Bool -> String
showB False = "0"
showB True = "1"
isqrt :: Int -> Integer -> Integer
isqrt bits val = final
where
bit' = part1 (1 `shiftL` (bits - 2))
--
part1 x | x > val = part1 (x `shiftR` 2)
| otherwise = x
--
final = loop val 0 bit'
--
loop num res bit
| bit == 0 = res
| otherwise = let (num', res') = adjust num res bit
in loop num' (res' `shiftR` 1) (bit `shiftR` 2)
adjust num res bit
| num >= (res + bit) = (num - (res + bit), res + (bit `shiftL` 1))
| otherwise = (num, res)
_run :: Integer -> Integer -> IO ()
_run inputx inputy =
do let (x, y, g, initState) = initialState inputx inputy 1

9
test-generator/Requirements.hs
View File

@@ -25,6 +25,7 @@ data Operation = Add
| SignedShift
| SignedSub
| SigConvert Int
| SquareRoot
| EGCD
| ModInv
| PrimeGen
@@ -47,7 +48,8 @@ needs = [ Need RSA (\ size -> [Req (size `div` 2) Sub,
])
, Need DSA (\ size -> [Req size BaseOps,
Req size Shifts,
Req size Add])
Req size Add,
Req size SquareRoot])
, Need PrimeGen (\ size -> [Req size Div,
Req size Shifts,
Req size ModExp,
@@ -149,6 +151,11 @@ needs = [ Need RSA (\ size -> [Req (size `div` 2) Sub,
Req (size + 64) SignedAdd,
Req size Barretts
])
, Need SquareRoot (\ size -> [Req size BaseOps,
Req size Shifts,
Req size Add,
Req size Sub
])
]
newRequirements :: Requirement -> [Requirement]

8
test-generator/Tests.hs
View File

@@ -39,6 +39,7 @@ testDatabase = [
(SignedShift, "sigshiftr", "signed shift right", sigshiftrTest),
(SignedShift, "sigshiftl", "signed shift left", sigshiftlTest),
(SignedSub, "sigsub", "signed subtraction", sigsubTest),
(SquareRoot, "sqrt", "square root", sqrtTest),
(EGCD, "egcd", "EGCD", egcdTest),
(ModInv, "modinv", "modular inversion", modinvTest)
]
@@ -202,6 +203,13 @@ sigsubTest size memory0 =
("c", showX c)]
in (res, c, memory2)
sqrtTest :: Test
sqrtTest size memory0 =
let (a, memory1) = generateNum memory0 "a" size
r = isqrt size a
res = Map.fromList [("a", showX a), ("r", showX r)]
in (res, r, memory1)
signedTest :: Test
signedTest size memory0 =
let (x, memory1) = genSign (generateNum memory0 "x" size)