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=f542f49f0e41b006f702029b0537c4018d327109;hp=f72395b43de8236a84508aaec2756e32038338c0;hb=c0d86015957eda6badbe9c6e5256807f9ab0c02f;hpb=8e04e7140bd58f941930dc15b890236f8a20c67b

diff --git a/labo2-fsharp/CryptoFile/API.fs b/labo2-fsharp/CryptoFile/API.fs
index f72395b..f542f49 100644
--- a/labo2-fsharp/CryptoFile/API.fs
+++ b/labo2-fsharp/CryptoFile/API.fs
@@ -30,8 +30,16 @@ module API =
 
     let internal (@@) a1 a2 = Array.append a1 a2
 
-    let generatKeysPair : Key * Key = Crypto.generateRSAKeysPair
+    let test = 256 / 8
+    let hmacSize = 256 / 8 // [byte].
+    let signatureSize = Crypto.rsaKeySize / 8 // [byte].
+    let keysSize = Crypto.rsaKeySize / 8 // [byte].
 
+    let generatKeysPair () : Key * Key = Crypto.generateRSAKeysPair ()
+
+    // Format of the container:
+    //  <mac><signature><encrypted keys><cyphertext>
+    // Where the sizes of the three first parts are given by 'hmacSize', 'signatureSize' and 'keysSize'.
     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 = FileInfo (inputFilePath)
@@ -39,7 +47,7 @@ module API =
         use outputStream = new FileStream (outputFilePath, FileMode.Create, FileAccess.Write)
         use writer = new BinaryWriter (outputStream)
 
-        outputStream.Position <- 32L + 256L // Skips mac and signature. They will be written later.
+        outputStream.Position <- (int64 <| hmacSize + signatureSize) // Skips mac and signature. They will be written later.
 
         Crypto.encryptRSA cryptPubKey (keyAES @@ keyMAC @@ iv) |> writer.Write
 
@@ -71,12 +79,12 @@ module API =
     let decryptFile (sourceFilePath : string) (targetDirPath : string) (signaturePubKey: Key) (decryptPrivKey : Key) =
         use inputStream = new FileStream (sourceFilePath, FileMode.Open, FileAccess.Read)
         use reader = new BinaryReader (inputStream)
-        let mac = reader.ReadBytes 32
-        let signature = reader.ReadBytes 256
+        let mac = reader.ReadBytes hmacSize
+        let signature = reader.ReadBytes signatureSize
         let keys = 
-            try reader.ReadBytes 256 |> Crypto.decryptRSA decryptPrivKey
+            try reader.ReadBytes keysSize |> Crypto.decryptRSA decryptPrivKey
             with 
-                | :? Security.Cryptography.CryptographicException -> raise UnableToDecryptAESKeys
+                | :? Security.Cryptography.CryptographicException -> raise UnableToDecryptKeys
         let keyAES = keys.[0..15]
         let keyMAC = keys.[16..47]
         let iv = keys.[48..63]
@@ -91,7 +99,7 @@ module API =
             raise SignatureMismatch
 
         // Decrypt metadata.
-        inputStream.Position <- 32L + 256L + 256L
+        inputStream.Position <- (int64 <| hmacSize + signatureSize + keysSize)
         use cryptoStream = Crypto.decryptAES keyAES iv inputStream
         let metadata = Metadata cryptoStream
 
@@ -99,6 +107,6 @@ module API =
         let filePath = Path.Combine (targetDirPath, metadata.get MetadataKeys.filename)
         let modificationTime = DateTime (metadata.get MetadataKeys.modificationTime |> int64)
         let fileInfo = FileInfo filePath
-        using (fileInfo.Create ()) <| fun outputStream -> cryptoStream.CopyTo outputStream
+        using (fileInfo.Create ()) cryptoStream.CopyTo // We have to close the result file before updating the modification time.
         fileInfo.LastWriteTimeUtc <- modificationTime
     
\ No newline at end of file