Merge pull request #15 from N6UDP/topic/aes256

Move to use AES256 for CMS

Author: sbidy

.gitignore

@@ -2,11 +2,8 @@
 # This .gitignore file was automatically created by Microsoft(R) Visual Studio.
 ################################################################################
 
-/.vs
-/KeyManagerUI/obj/Release
-/KeyManagerUI/obj/Debug
-/KeyManagerUI/obj/
-/KeyManagerUI/bin/
-/KeyManagerUI/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
-/KeyManagerUI/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
-/KeyManagerUI/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+.vs/
+obj/
+bin/
+*.zip
+*.plgx

KeyManagerUI.plgx

@@ -45,9 +45,9 @@ public byte[] EncryptMsg(Byte[] msg, X509Certificate2Collection recipientCerts)
                 //  Instantiate an EnvelopedCms object with the ContentInfo
                 //  above.
                 //  Has default SubjectIdentifierType IssuerAndSerialNumber.
-                //  Has default ContentEncryptionAlgorithm property value
-                //  RSA_DES_EDE3_CBC.
-                EnvelopedCms envelopedCms = new EnvelopedCms(contentInfo);
+                //  Force usage of AES256 instead of 3DES
+                Oid aes256 = Oid.FromFriendlyName("aes256", OidGroup.EncryptionAlgorithm);
+                EnvelopedCms envelopedCms = new EnvelopedCms(contentInfo, new AlgorithmIdentifier(aes256));
 
                 //  Formulate a CmsRecipient object collection that
                 //  represent information about the recipients 

KeyManagerUI/Certmanager.cs

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KeyManagerUI</RootNamespace>
     <AssemblyName>KeyManagerUI</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

KeyManagerUI/KeyManagerUI.csproj

@@ -147,7 +147,7 @@ byte[] GetExistingKey(IOConnectionInfo ioc)
                 // fall back on opening a local file
                 // FUTURE ENHANCEMENT: allow user to enter a URL and name/pwd as well
 
-                OpenFileDialog ofd = UIUtil.CreateOpenFileDialog("KeePassX509Provider", UIUtil.CreateFileTypeFilter(CertProtKeyFileExtension, "x05KeyFile", true), 1, CertProtKeyFileExtension, false /* multi-select */, true);
+                OpenFileDialog ofd = (OpenFileDialog)UIUtil.CreateOpenFileDialog("KeePassX509Provider", UIUtil.CreateFileTypeFilter(CertProtKeyFileExtension, "x05KeyFile", true), 1, CertProtKeyFileExtension, false /* multi-select */, string.Empty).FileDialog;
 
                 if (ofd.ShowDialog() != DialogResult.OK)
                 {