AES padding op PKC7S gezet

git-svn-id: https://svn.sdnsupport.nl:448/svn/UCS_New_KeyGenerator/trunk@5 fb98f456-852b-ae4b-87b5-d34767d02741

KeyFileGenerator/Form1.vb

@@ -208,7 +208,7 @@ Public Class KeyFileGenerator
         Try
             Dim clearBytes As Byte() = Encoding.Unicode.GetBytes(clearText)
             Using encryptor As Aes = Aes.Create()
-
+                encryptor.Padding = PaddingMode.PKCS7
                 Dim saltArray As Byte() = Encoding.ASCII.GetBytes(ProcId)
 
                 Dim pdb As New Rfc2898DeriveBytes(EncryptionKey, saltArray)
@@ -234,6 +234,7 @@ Public Class KeyFileGenerator
         Try
             Dim cipherBytes As Byte() = Convert.FromBase64String(cipherText)
             Using encryptor As Aes = Aes.Create()
+                encryptor.Padding = PaddingMode.PKCS7
                 Dim saltArray As Byte() = Encoding.ASCII.GetBytes(ProcId)
                 Dim pdb As New Rfc2898DeriveBytes(EncryptionKey, saltArray)
                 encryptor.Key = pdb.GetBytes(32)

KeyFileGenerator/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.4")> 
-<Assembly: AssemblyFileVersion("1.0.0.4")> 
+<Assembly: AssemblyVersion("1.0.0.5")> 
+<Assembly: AssemblyFileVersion("1.0.0.5")> 

KeyFileGenerator/bin/Debug/KeyFileGenerator.vshost.exe.manifest

@@ -1,11 +1,58 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+
+      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
+
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+
+      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
+
+      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->
+
+    </application>
+  </compatibility>
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+
+</asmv1:assembly>