X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=labo2-fsharp%2FCryptoFile%2FUnitTests.fs;h=51912d35306be0821126540543cb8527083be7c0;hb=c0d86015957eda6badbe9c6e5256807f9ab0c02f;hp=e43d7b4549b7e73559171b3ad88d127475ce9446;hpb=cec3ba87beeee522369d8f6fe85aa05cb9c78175;p=crypto_lab2.git

diff --git a/labo2-fsharp/CryptoFile/UnitTests.fs b/labo2-fsharp/CryptoFile/UnitTests.fs
index e43d7b4..51912d3 100644
--- a/labo2-fsharp/CryptoFile/UnitTests.fs
+++ b/labo2-fsharp/CryptoFile/UnitTests.fs
@@ -7,7 +7,7 @@ module UnitTests =
     open Crypto
 
     let testRSA () =
-        let kpub, kpriv = generateRSAKeysPair
+        let kpub, kpriv = generateRSAKeysPair ()
         let plaintext = "Are you from the past?"
         let cipherdata = encryptRSA kpub (Encoding.UTF8.GetBytes plaintext)
         let decryptedData = decryptRSA kpriv cipherdata
@@ -17,9 +17,9 @@ module UnitTests =
         printfn "testRSA OK"
 
     let testRSASignature () =
-        let kpub, kpriv = generateRSAKeysPair
+        let kpub, kpriv = generateRSAKeysPair ()
         let plaintext = "Lightspeed is too slow. We'll have to go right to ludicrous speed!"
-        let sha256 = new SHA256Managed ()
+        use sha256 = new SHA256Managed ()
         let signature = signRSA kpriv (sha256.ComputeHash (Encoding.UTF8.GetBytes plaintext))
         assert verifySignRSA kpub (sha256.ComputeHash (Encoding.UTF8.GetBytes plaintext)) signature
         assert not (verifySignRSA kpub (sha256.ComputeHash (Encoding.UTF8.GetBytes "Hello!")) signature)
@@ -27,19 +27,19 @@ module UnitTests =
 
     let testAES () =
         let plaintext = "There is no place like 127.0.0.1"
-        let memory = new MemoryStream ()
-        let key = Crypto.rand 32
+        use memory = new MemoryStream ()
+        let key = Crypto.rand 16
         let iv = Crypto.rand 16
 
         let input = encryptAES key iv memory
-        let sw = new StreamWriter (input)
+        use sw = new StreamWriter (input)
         sw.Write plaintext
         sw.Flush ()
         input.FlushFinalBlock ()
 
         memory.Position <- 0L
         let output = decryptAES key iv memory
-        let sr = new StreamReader (output)
+        use sr = new StreamReader (output)
 
         assert (sr.ReadToEnd () = plaintext)
         printfn "testAES OK"