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=d4b9ad56d7070faaecee0a42ea3ae6bf3d3c38ef;hp=424959da80403c3b1bb88ad0fcfcfa29f687f154;hb=f88f22ebc8d780fbd86358bf95dffcfb3803f509;hpb=aa6da23b467f0fad1344c6dd29972f56cad7175c

diff --git a/labo2-fsharp/CryptoFile/API.fs b/labo2-fsharp/CryptoFile/API.fs
index 424959d..d4b9ad5 100644
--- a/labo2-fsharp/CryptoFile/API.fs
+++ b/labo2-fsharp/CryptoFile/API.fs
@@ -24,19 +24,19 @@ type internal Metadata (d: (string * string) list) =
                     | _ -> None) d
 
 module API =
-    module internal Metadata =
-        let filenameKey = "filename"
-        let modificationTimeKey = "file-modification-time"
+    module internal MetadataKeys =
+        let filename = "filename"
+        let modificationTime = "file-modification-time"
 
     let internal (@@) a1 a2 = Array.append a1 a2
 
     let generatKeysPair : Key * Key = Crypto.generateRSAKeysPair
 
     let encryptFile (inputFilePath : string) (outputFilePath : string) (signaturePrivKey: Key) (cryptPubKey : Key)  =
-        let keyAES, keyMAC, iv = Crypto.rand 32, Crypto.rand 32, Crypto.rand 16
+        let keyAES, keyMAC, iv = Crypto.rand 16, Crypto.rand 32, Crypto.rand 16
         let fileInfo = new FileInfo (inputFilePath)
         use inputStream = fileInfo.OpenRead ()
-        use outputStream = new FileStream (outputFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, 4096 * 100)
+        use outputStream = new FileStream (outputFilePath, FileMode.Create, FileAccess.Write)
         let writer = new BinaryWriter (outputStream)
 
         outputStream.Position <- 32L + 256L // Skips mac and signature. They will be written later.
@@ -49,8 +49,8 @@ module API =
         let cryptoWriter = new BinaryWriter (cryptoStream)
 
         // Write the file metadata.
-        let metaData = new Metadata ([Metadata.filenameKey, fileInfo.Name
-                                      Metadata.modificationTimeKey, fileInfo.LastWriteTimeUtc.Ticks.ToString ()])
+        let metaData = new Metadata ([MetadataKeys.filename, fileInfo.Name
+                                      MetadataKeys.modificationTime, fileInfo.LastWriteTimeUtc.Ticks.ToString ()])
         metaData.WriteTo cryptoStream
 
         // Write the content of the file.
@@ -77,9 +77,9 @@ module API =
             try reader.ReadBytes 256 |> Crypto.decryptRSA decryptPrivKey
             with 
                 | :? Security.Cryptography.CryptographicException -> raise UnableToDecryptAESKeys
-        let keyAES = keys.[0..31]
-        let keyMAC = keys.[32..63]
-        let iv = keys.[64..79]
+        let keyAES = keys.[0..15]
+        let keyMAC = keys.[16..47]
+        let iv = keys.[48..63]
 
         // Integrity validation.
         let mac' = Crypto.ComputeHMAC keyMAC inputStream
@@ -96,8 +96,8 @@ module API =
         let metadata = new Metadata (cryptoStream)
 
         // Create the file and write its content and metadata.
-        let filePath = Path.Combine (targetDirPath, metadata.get Metadata.filenameKey)
-        let modificationTime = new DateTime (metadata.get Metadata.modificationTimeKey |> int64)
+        let filePath = Path.Combine (targetDirPath, metadata.get MetadataKeys.filename)
+        let modificationTime = new DateTime (metadata.get MetadataKeys.modificationTime |> int64)
         let fileInfo = new FileInfo (filePath)
         using (fileInfo.Create ()) <| fun outputStream -> cryptoStream.CopyTo outputStream
         fileInfo.LastWriteTimeUtc <- modificationTime