X-Git-Url: http://git.euphorik.ch/?p=crypto_lab2.git;a=blobdiff_plain;f=labo2-fsharp%2FCryptoFile%2FAPI.fs;fp=labo2-fsharp%2FCryptoFile%2FAPI.fs;h=886b0d927b01d332fef164c3fdc4f6d44b6cd53d;hp=d4b9ad56d7070faaecee0a42ea3ae6bf3d3c38ef;hb=95f772ef77baee15929c1feccc4de4c9a795f81d;hpb=0126bf5a082b8e37ad1dc5f7686802146269ae97

diff --git a/labo2-fsharp/CryptoFile/API.fs b/labo2-fsharp/CryptoFile/API.fs
index d4b9ad5..886b0d9 100644
--- a/labo2-fsharp/CryptoFile/API.fs
+++ b/labo2-fsharp/CryptoFile/API.fs
@@ -9,7 +9,7 @@ type internal Metadata (d: (string * string) list) =
     new (stream : Stream) =
         let reader = new BinaryReader (stream)
         let length = reader.ReadByte () |> int
-        new Metadata ([for i in 1..length -> reader.ReadString (), reader.ReadString ()])
+        Metadata ([for i in 1..length -> reader.ReadString (), reader.ReadString ()])
 
     // Write metadata to a stream.
     member this.WriteTo (stream : Stream) =
@@ -34,10 +34,10 @@ module API =
 
     let encryptFile (inputFilePath : string) (outputFilePath : string) (signaturePrivKey: Key) (cryptPubKey : Key)  =
         let keyAES, keyMAC, iv = Crypto.rand 16, Crypto.rand 32, Crypto.rand 16
-        let fileInfo = new FileInfo (inputFilePath)
+        let fileInfo = FileInfo (inputFilePath)
         use inputStream = fileInfo.OpenRead ()
         use outputStream = new FileStream (outputFilePath, FileMode.Create, FileAccess.Write)
-        let writer = new BinaryWriter (outputStream)
+        use writer = new BinaryWriter (outputStream)
 
         outputStream.Position <- 32L + 256L // Skips mac and signature. They will be written later.
 
@@ -46,11 +46,11 @@ module API =
         // Plaintext -> cryptoStream -> hmacStream -> cyphertext.
         let hmacStream, hmac = Crypto.HMACStream keyMAC outputStream
         use cryptoStream = Crypto.encryptAES keyAES iv hmacStream
-        let cryptoWriter = new BinaryWriter (cryptoStream)
+        use cryptoWriter = new BinaryWriter (cryptoStream)
 
         // Write the file metadata.
-        let metaData = new Metadata ([MetadataKeys.filename, fileInfo.Name
-                                      MetadataKeys.modificationTime, fileInfo.LastWriteTimeUtc.Ticks.ToString ()])
+        let metaData = Metadata ([MetadataKeys.filename, fileInfo.Name
+                                  MetadataKeys.modificationTime, fileInfo.LastWriteTimeUtc.Ticks.ToString ()])
         metaData.WriteTo cryptoStream
 
         // Write the content of the file.
@@ -93,12 +93,12 @@ module API =
         // Decrypt metadata.
         inputStream.Position <- 32L + 256L + 256L
         use cryptoStream = Crypto.decryptAES keyAES iv inputStream
-        let metadata = new Metadata (cryptoStream)
+        let metadata = Metadata (cryptoStream)
 
         // Create the file and write its content and metadata.
         let filePath = Path.Combine (targetDirPath, metadata.get MetadataKeys.filename)
-        let modificationTime = new DateTime (metadata.get MetadataKeys.modificationTime |> int64)
-        let fileInfo = new FileInfo (filePath)
+        let modificationTime = DateTime (metadata.get MetadataKeys.modificationTime |> int64)
+        let fileInfo = FileInfo (filePath)
         using (fileInfo.Create ()) <| fun outputStream -> cryptoStream.CopyTo outputStream
         fileInfo.LastWriteTimeUtc <- modificationTime
     
\ No newline at end of file