projects
/
crypto_lab2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change RSA key size from 2048 to 3072.
[crypto_lab2.git]
/
labo2-fsharp
/
CryptoFileTests
/
Program.fs
diff --git
a/labo2-fsharp/CryptoFileTests/Program.fs
b/labo2-fsharp/CryptoFileTests/Program.fs
index
4b83072
..
509b6d7
100644
(file)
--- a/
labo2-fsharp/CryptoFileTests/Program.fs
+++ b/
labo2-fsharp/CryptoFileTests/Program.fs
@@
-1,7
+1,7
@@
module CryptoFileTests.Main
open System
module CryptoFileTests.Main
open System
-open System.IO
;
+open System.IO
open CryptoFile
let printUsage () =
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
// 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 the
n
returned.
let getKey (filenamePub: string) (filenamePriv: string) : Key * Key =
try
use srPub = new StreamReader (filenamePub)
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)
| _ ->
use swPub = new StreamWriter (filenamePub)
use swPriv = new StreamWriter (filenamePriv)
- let key
SigPub, keySigPriv = API.generatKeysPair
- swPub.Write key
Sig
Pub
- swPriv.Write key
Sig
Priv
- key
SigPub, keySig
Priv
+ let key
Pub, keyPriv = API.generatKeysPair ()
+ swPub.Write keyPub
+ swPriv.Write keyPriv
+ key
Pub, key
Priv
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 =
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
let keySigPub, keySigPriv = Keys.getSig
let keyCryptPub, keyCryptPriv = Keys.getCrypt
match args with
- | [| "tests" |] -> Tests.
runAll
Tests ()
+ | [| "tests" |] -> Tests.
doSome
Tests ()
| [| "encrypt"; input; output |] -> API.encryptFile input output keySigPriv keyCryptPub
| [| "decrypt"; input; outputDir |] -> API.decryptFile input outputDir keySigPub keyCryptPriv
| _ -> printUsage ()
0
| [| "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