Merge branch 'master' of https://github.com/johnkellyoxford/EncryptionApp

Author: john-h-k

Encryption App/AES/pbkdf2hash.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Security.Cryptography;
+
+namespace PBKDF2Hash
+{
+    private static byte[] GenerateSalt()
+    {
+        var csprng = new RNGCryptoServiceProvider();
+        var salt = new byte[32];
+        csprng.GetBytes(salt);
+        return salt;
+    }
+
+    public static (byte[] hash, byte[] salt) pbkdf2hash(string password)
+    {
+
+        string password = "passwd";
+        byte[] salt = GenerateSalt();//warning shouldnt be random salts - change when you try and decrypt no?
+        int iterations = 100000;
+        byte[] hashValue;
+        using (var pbkdf2 = new Rfc2898DeriveBytes(password, salt, iterations))
+        {
+            hashValue = pbkdf2.GetBytes(32);
+        }
+        return (hashValue,salt);
+    }
+}

README.md

@@ -1 +1,14 @@
-# EncryptionApp
+# EncryptionApp
+
+## Documentation:
+
+
+## To do:
+* [AES](https://github.com/johnkellyoxford/EncryptionApp/tree/master/Encryption%20App/AES):
+  *   decryption algorithm and move to seperate file
+* RSA
+* Incorporate microsoft data protector
+* .crypt header files
+* Create documentation and tutorial
+* create a microsoft installer application with certificates --> trust
+* Sell rip-off usb drives with this content on