X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=labo2-fsharp%2FCryptoFileTests%2FProgram.fs;fp=labo2-fsharp%2FCryptoFileTests%2FProgram.fs;h=a0cfba9cd5268d43f239e942456b446ce14bcce8;hb=61a8b3492e89e883b23c158eb52ba2b070234df8;hp=b8249123941017f74a7f8a3e19aa85be6ee3e15e;hpb=19a9446e4042d5e451f1ae0534ffba242d33879e;p=crypto_lab2.git diff --git a/labo2-fsharp/CryptoFileTests/Program.fs b/labo2-fsharp/CryptoFileTests/Program.fs index b824912..a0cfba9 100644 --- a/labo2-fsharp/CryptoFileTests/Program.fs +++ b/labo2-fsharp/CryptoFileTests/Program.fs @@ -24,10 +24,10 @@ 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" @@ -38,7 +38,7 @@ let main args = 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 ()