From: Ummon <greg.burri@gmail.com>
Date: Wed, 26 Nov 2014 22:32:07 +0000 (+0100)
Subject: Clean up.
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=ac84e8535149dbf639a7766f110960c998b47159;p=crypto_lab2.git

Clean up.
---

diff --git a/labo2-fsharp/CryptoFile/Crypto.fs b/labo2-fsharp/CryptoFile/Crypto.fs
index 836d636..21b168e 100644
--- a/labo2-fsharp/CryptoFile/Crypto.fs
+++ b/labo2-fsharp/CryptoFile/Crypto.fs
@@ -75,19 +75,8 @@ module internal Crypto =
         let decryptor = aes.CreateDecryptor (key, iv)
         new CryptoStream (inputStream, decryptor, CryptoStreamMode.Read)
 
+    // Create a stream to compute the HMAC-SHA256 against all data being written.
     let HMACStream (key: byte[]) (outputStream: Stream) : Stream * HMACSHA256 = 
         assert (key.Length = 32)
         let hmac = new HMACSHA256 (key)
-        new CryptoStream (outputStream, hmac, CryptoStreamMode.Write) :> Stream, hmac
-
-    (*type HMACStream (buffer: byte[], output: Stream) =
-        inherit Stream () 
-        override this.CanRead with get () = false
-        override this.CanSeek with get () = false
-        override this.CanWrite with get () = true
-        override this.Length with get () = raise <| new NotSupportedException ()
-        override this.Position with get () = raise <| new NotSupportedException ()
-                               and set _ = raise <| new NotSupportedException ()
-        override this.Flush () =
-            output.Flush ()
-        override this.Read (_: byte[], _: int, _: int) = raise <| new NotSupportedException ()*)
\ No newline at end of file
+        new CryptoStream (outputStream, hmac, CryptoStreamMode.Write) :> Stream, hmac
\ No newline at end of file
diff --git a/labo2-fsharp/labo2-fsharp.userprefs b/labo2-fsharp/labo2-fsharp.userprefs
index 8598d4a..5aa50ca 100644
--- a/labo2-fsharp/labo2-fsharp.userprefs
+++ b/labo2-fsharp/labo2-fsharp.userprefs
@@ -1,16 +1,19 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="CryptoFileTests/Program.fs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="CryptoFile/API.fs">
     <Files>
-      <File FileName="CryptoFile/Crypto.fs" Line="1" Column="1" />
-      <File FileName="CryptoFileTests/Program.fs" Line="14" Column="14" />
-      <File FileName="CryptoFile/Tests.fs" Line="20" Column="20" />
+      <File FileName="CryptoFile/Types.fs" Line="1" Column="1" />
+      <File FileName="CryptoFile/API.fs" Line="36" Column="36" />
+      <File FileName="CryptoFile/Crypto.fs" Line="97" Column="97" />
+      <File FileName="CryptoFile/Tests.fs" Line="25" Column="25" />
+      <File FileName="CryptoFileTests/AssemblyInfo.fs" Line="7" Column="7" />
+      <File FileName="CryptoFileTests/Program.fs" Line="5" Column="5" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
-          <Node name="CryptoFile" expanded="True" />
-          <Node name="CryptoFileTests" expanded="True" selected="True" />
+          <Node name="CryptoFile" expanded="True" selected="True" />
+          <Node name="CryptoFileTests" expanded="True" />
         </State>
       </Pad>
     </Pads>
diff --git a/rapport/main.tex b/rapport/main.tex
index 526fcc9..7e2c280 100644
--- a/rapport/main.tex
+++ b/rapport/main.tex
@@ -170,6 +170,9 @@ Concerne les clefs gérer à l'intérieur du container.
 \end{itemize}
 
 
+17 Mo de mémoire et 19 s pour chiffrer un fichier de 404 Mo
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Conclusion}