X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=labo2-fsharp%2FCryptoFileTests%2FProgram.fs;h=509b6d7aa331283aa15df900aadd15e3b66be405;hb=HEAD;hp=4b8307245ec55993038759904dcb84edbf82341b;hpb=137157b6dbd5efb99b486a30da6e10b0a175f530;p=crypto_lab2.git

diff --git a/labo2-fsharp/CryptoFileTests/Program.fs b/labo2-fsharp/CryptoFileTests/Program.fs
index 4b83072..509b6d7 100644
--- a/labo2-fsharp/CryptoFileTests/Program.fs
+++ b/labo2-fsharp/CryptoFileTests/Program.fs
@@ -1,7 +1,7 @@
 module CryptoFileTests.Main
 
 open System
-open System.IO;
+open System.IO
 open CryptoFile
 
 let printUsage () = 
@@ -14,7 +14,7 @@ let printUsage () =
 // The private keys are stored in plain file! Do not let anyone access these files!
 module internal Keys =
     // Try to read the public key and private key from files. If one of a file doesn't exist
-    // a new key pair is created, stored the returned.
+    // a new key pair is created, stored then returned.
     let getKey (filenamePub: string) (filenamePriv: string) : Key * Key =
         try
             use srPub = new StreamReader (filenamePub)
@@ -24,24 +24,23 @@ module internal Keys =
         | _ ->
             use swPub = new StreamWriter (filenamePub)
             use swPriv = new StreamWriter (filenamePriv)
-            let keySigPub, keySigPriv = API.generatKeysPair
-            swPub.Write keySigPub
-            swPriv.Write keySigPriv
-            keySigPub, keySigPriv
+            let keyPub, keyPriv = API.generatKeysPair ()
+            swPub.Write keyPub
+            swPriv.Write keyPriv
+            keyPub, keyPriv
 
     let getSig : Key * Key = getKey "keys-sign.pub" "keys-sign.priv"
     let getCrypt : Key * Key = getKey "keys-crypt.pub" "keys-crypt.priv"
 
 [<EntryPoint>]
 let main args = 
-    printfn "Labo n°2"
-
     let keySigPub, keySigPriv = Keys.getSig
     let keyCryptPub, keyCryptPriv = Keys.getCrypt
 
     match args with
-    | [| "tests" |] -> Tests.runAllTests ()
+    | [| "tests" |] -> Tests.doSomeTests ()
     | [| "encrypt"; input; output |] -> API.encryptFile input output keySigPriv keyCryptPub
     | [| "decrypt"; input; outputDir |] -> API.decryptFile input outputDir keySigPub keyCryptPriv
     | _ -> printUsage ()
     0
+   
\ No newline at end of file