Rewrite against a newer cryptonum.

tests/rsa/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Revision history for genrsa
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.

tests/rsa/LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) 2018 Adam Wick
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.

tests/rsa/Setup.hs

@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain

tests/rsa/genrsa.cabal

@@ -0,0 +1,21 @@
+name:                genrsa
+version:             0.1.0.0
+-- synopsis:
+-- description:
+license:             ISC
+license-file:        LICENSE
+author:              Adam Wick
+maintainer:          awick@uhsure.com
+-- copyright:
+category:            Math
+build-type:          Simple
+extra-source-files:  CHANGELOG.md
+cabal-version:       >=1.10
+
+executable genrsa
+  main-is:             genrsa.hs
+  -- other-modules:
+  -- other-extensions:
+  build-depends:       base >=4.11 && <4.12, RSA >=2.3 && <2.4, crypto-api >=0.13 && <0.14, bytestring >=0.10 && <0.11, containers >=0.5 && <0.6
+  -- hs-source-dirs:
+  default-language:    Haskell2010

tests/rsa/genrsa.hs

@@ -63,6 +63,8 @@ genCase g0 size =
        (Right sig, Right (cipher, g4)) ->
          (Map.fromList [("d", Numeric.showHex d ""),
                         ("n", Numeric.showHex n ""),
+                        ("k", Numeric.showHex (computeK n) ""),
+                        ("u", Numeric.showHex (barrett n) "" ),
                         ("h", show hashlen),
                         ("m", showBytes msg),
                         ("s", showBytes sig),
@@ -72,6 +74,20 @@ genCase g0 size =
        (_, _) ->
          genCase g3 size
 
+base :: Integer
+base = 2 ^ (64 :: Integer)
+
+barrett :: Integer -> Integer
+barrett m = (base ^ (2 * k)) `div` m
+ where
+  k = computeK m
+
+computeK :: Integer -> Int
+computeK v = go 0 1
+ where
+  go k acc | v <= acc  = k
+           | otherwise = go (k + 1) (acc * base)
+
 go :: CryptoRandomGen g => g -> Handle -> Int -> Int -> IO ()
 go _ _ _ 0 = return ()
 go g hndl size count =