X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=labo2-fsharp%2FCryptoFile%2FCrypto.fs;h=3ed1c5dcc2387aadb69d51879d9945f7c3f0b9ea;hb=57d7ae8d75a854296718cb1056efbeb476309908;hp=c81475b9e24cc6096fb04f07c1e4762ed160ccc8;hpb=f88f22ebc8d780fbd86358bf95dffcfb3803f509;p=crypto_lab2.git

diff --git a/labo2-fsharp/CryptoFile/Crypto.fs b/labo2-fsharp/CryptoFile/Crypto.fs
index c81475b..3ed1c5d 100644
--- a/labo2-fsharp/CryptoFile/Crypto.fs
+++ b/labo2-fsharp/CryptoFile/Crypto.fs
@@ -4,70 +4,72 @@ open System
 open System.IO
 open System.Security.Cryptography
 
-// Some cryptography primitives specific to CryptoFile.
+// Some cryptography primitives specific to 'CryptoFile'.
 module internal Crypto =
     type Data = byte[]
 
-    let rsaKeySize = 2048
-    let aesKeySize = 128
+    let rsaKeySize = 3072 // [bit]. For encrypting and signing.
+    let aesKeySize = 128 // [bit].
 
-    /// Returns a cryptographically strong sequence of bytes.
+    exception KeySizeError
+    exception IVSizeError
+
+    /// Return a cryptographically strong sequence of bytes.
     let rand size : byte[] =
         let result = Array.zeroCreate size
-        let generator = new RNGCryptoServiceProvider ()
+        use generator = new RNGCryptoServiceProvider ()
         generator.GetBytes result
         result
 
     /// Generate a new RSA key pair: (public * private).
-    let generateRSAKeysPair : Key * Key =
+    let generateRSAKeysPair () : Key * Key =
         use rsa = new RSACryptoServiceProvider (rsaKeySize)
         rsa.ToXmlString false, rsa.ToXmlString true
 
     let encryptRSA (publicKey: Key) (plaindata: Data) : Data =
         use rsa = new RSACryptoServiceProvider (rsaKeySize)
         rsa.FromXmlString publicKey
-        rsa.Encrypt (plaindata, false) // Uses PKCS#1 v1.5 padding.
+        rsa.Encrypt (plaindata, true) // Use padding OAEP (PKCS#1 v2).
 
     let decryptRSA (privateKey: Key) (cipherdata: Data) : Data =
         use rsa = new RSACryptoServiceProvider (rsaKeySize)
         rsa.FromXmlString privateKey
-        rsa.Decrypt (cipherdata, false) // Uses PKCS#1 v1.5 padding.
+        rsa.Decrypt (cipherdata, true) // Use padding OAEP (PKCS#1 v2).
 
-    /// Produces a signature from a given hash.
-    let signRSA (privKey: Key) (sha256: Data) : Data = 
+    /// Produce a signature from the given data.
+    let signRSA (privKey: Key) (data: Data) : Data = 
         use rsa = new RSACryptoServiceProvider (rsaKeySize)
         rsa.FromXmlString privKey
-        rsa.SignHash (sha256, CryptoConfig.MapNameToOID "SHA256")
+        rsa.SignHash (data, CryptoConfig.MapNameToOID "SHA256")
 
-    /// Verify a signature against a given hash.
-    let verifySignRSA (pubKey: Key) (sha256: Data) (signature: Data) : bool =
+    /// Verify a signature against the given data.
+    let verifySignRSA (pubKey: Key) (data: Data) (signature: Data) : bool =
         use rsa = new RSACryptoServiceProvider (rsaKeySize)
         rsa.FromXmlString pubKey
-        rsa.VerifyHash (sha256, CryptoConfig.MapNameToOID "SHA256", signature)
+        rsa.VerifyHash (data, CryptoConfig.MapNameToOID "SHA256", signature)
 
-    /// Returns an encrypted output stream.
+    /// Return an encrypted output stream.
     let encryptAES (key: byte[]) (iv: byte[]) (outputStream: Stream) : CryptoStream =
-        assert (key.Length = aesKeySize / 8 && iv.Length = 16)
-        use aes = new AesCryptoServiceProvider () // Default mode is CBC.
-        aes.KeySize <- aesKeySize
-        let encryptor = aes.CreateEncryptor (key, iv)
-        new CryptoStream (outputStream, encryptor, CryptoStreamMode.Write)
+        if key.Length <> aesKeySize / 8 then raise KeySizeError
+        if iv.Length <> 16 then raise IVSizeError
+        use aes = new AesCryptoServiceProvider (KeySize = aesKeySize) // Default mode is CBC.
+        new CryptoStream (outputStream, aes.CreateEncryptor (key, iv), CryptoStreamMode.Write)
 
-    /// Returns a decrypted input stream.
+    /// Return a decrypted input stream.
     let decryptAES (key: byte[]) (iv: byte[]) (inputStream: Stream) : CryptoStream =
-        assert (key.Length = aesKeySize / 8 && iv.Length = 16)
-        use aes = new AesCryptoServiceProvider ()
-        aes.KeySize <- aesKeySize
-        let decryptor = aes.CreateDecryptor (key, iv)
-        new CryptoStream (inputStream, decryptor, CryptoStreamMode.Read)
+        if key.Length <> aesKeySize / 8 then raise KeySizeError
+        if iv.Length <> 16 then raise IVSizeError
+        use aes = new AesCryptoServiceProvider (KeySize = aesKeySize)
+        new CryptoStream (inputStream, aes.CreateDecryptor (key, iv), CryptoStreamMode.Read)
 
-    // Create a stream to compute the HMAC-SHA256 against all data being written.
+    /// Create a stream to compute HMAC-SHA256 against all data being written.
     let HMACStream (key: byte[]) (outputStream: Stream) : Stream * HMACSHA256 = 
-        assert (key.Length = 32)
+        if key.Length <> 32 then raise KeySizeError
         let hmac = new HMACSHA256 (key)
         new CryptoStream (outputStream, hmac, CryptoStreamMode.Write) :> Stream, hmac
 
+    /// Compute HMAC-SHA256 for all the data in the input stream.
     let ComputeHMAC (key: byte[]) (inputStream: Stream) : byte[] =
-        assert (key.Length = 32)
-        let hmac = new HMACSHA256 (key)
+        if key.Length <> 32 then raise KeySizeError
+        use hmac = new HMACSHA256 (key)
         hmac.ComputeHash inputStream
\ No newline at end of file