Merge pull request #78 from CyberSource/bugfix/mle-cert-issue

gaubansa · web-flow · commit 8380bb193489 · 2025-04-03T23:04:58.000+05:30
Bugfix/mle cert issue
diff --git a/CyberSource.nuspec b/CyberSource.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>CyberSource</id>
-    <version>1.4.9</version>
+    <version>1.4.10</version>
 	<title>CyberSource Corporation</title>
     <authors>CyberSource Corporation</authors>
     <owners>CyberSource Corporation</owners>
diff --git a/CyberSource/Base/Properties/AssemblyInfo.cs b/CyberSource/Base/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.9")]
-[assembly: AssemblyFileVersion("1.4.9")]
+[assembly: AssemblyVersion("1.4.10")]
+[assembly: AssemblyFileVersion("1.4.10")]
diff --git a/CyberSource/Client/NVPClient.cs b/CyberSource/Client/NVPClient.cs
@@ -88,10 +88,8 @@ public static Hashtable RunTransaction(
                                 logger.LogInfo("Loading certificate for " + config.KeyAlias);
                             }
 
-                            X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                             X509Certificate2Collection collection = new X509Certificate2Collection();
-                            collection.Add(userCertificate);
+                            collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                             X509Certificate2 newMerchantCert = null;
                             X509Certificate2 newCybsCert = null;
@@ -124,10 +122,8 @@ public static Hashtable RunTransaction(
                     }
                     else
                     {
-                        X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                         X509Certificate2Collection collection = new X509Certificate2Collection();
-                        collection.Add(userCertificate);
+                        collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                         foreach (X509Certificate2 cert1 in collection)
                         {
diff --git a/CyberSource/Client/Properties/AssemblyInfo.cs b/CyberSource/Client/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.9")]
-[assembly: AssemblyFileVersion("1.4.9")]
+[assembly: AssemblyVersion("1.4.10")]
+[assembly: AssemblyFileVersion("1.4.10")]
diff --git a/CyberSource/Client/SoapClient.cs b/CyberSource/Client/SoapClient.cs
@@ -91,10 +91,8 @@ public static ReplyMessage RunTransaction(
                                 logger.LogInfo("Loading certificate for " + config.KeyAlias);
                             }
 
-                            X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                             X509Certificate2Collection collection = new X509Certificate2Collection();
-                            collection.Add(userCertificate);
+                            collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                             X509Certificate2 newMerchantCert = null;
                             X509Certificate2 newCybsCert = null;
@@ -127,10 +125,8 @@ public static ReplyMessage RunTransaction(
                     }
                     else
                     {
-                        X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                         X509Certificate2Collection collection = new X509Certificate2Collection();
-                        collection.Add(userCertificate);
+                        collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                         foreach (X509Certificate2 cert1 in collection)
                         {
diff --git a/CyberSource/Client/XmlClient.cs b/CyberSource/Client/XmlClient.cs
@@ -106,10 +106,8 @@ public static XmlDocument RunTransaction(
                             logger.LogInfo("Loading certificate for "+ config.KeyAlias);
                         }
 
-                        X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                         X509Certificate2Collection collection = new X509Certificate2Collection();
-                        collection.Add(userCertificate);
+                        collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                         X509Certificate2 newMerchantCert = null;
                         X509Certificate2 newCybsCert = null;
@@ -142,10 +140,8 @@ public static XmlDocument RunTransaction(
                 }
                 else
                 {
-                    X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
-
                     X509Certificate2Collection collection = new X509Certificate2Collection();
-                    collection.Add(userCertificate);
+                    collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
 
                     foreach (X509Certificate2 cert1 in collection)
                     {
diff --git a/CyberSourceTests/BaseTest/Properties/AssemblyInfo.cs b/CyberSourceTests/BaseTest/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.9.0")]
-[assembly: AssemblyFileVersion("1.4.9.0")]
+[assembly: AssemblyVersion("1.4.10.0")]
+[assembly: AssemblyFileVersion("1.4.10.0")]
diff --git a/CyberSourceTests/MTTest/Properties/AssemblyInfo.cs b/CyberSourceTests/MTTest/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.9.0")]
-[assembly: AssemblyFileVersion("1.4.9.0")]
+[assembly: AssemblyVersion("1.4.10.0")]
+[assembly: AssemblyFileVersion("1.4.10.0")]

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,8 @@ public static Hashtable RunTransaction(`
`88`	`88`	`logger.LogInfo("Loading certificate for " + config.KeyAlias);`
`89`	`89`	`}`
`90`	`90`
`91`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`92`		`-`
`93`	`91`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`94`		`- collection.Add(userCertificate);`
	`92`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`95`	`93`
`96`	`94`	`X509Certificate2 newMerchantCert = null;`
`97`	`95`	`X509Certificate2 newCybsCert = null;`
`@@ -124,10 +122,8 @@ public static Hashtable RunTransaction(`
`124`	`122`	`}`
`125`	`123`	`else`
`126`	`124`	`{`
`127`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`128`		`-`
`129`	`125`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`130`		`- collection.Add(userCertificate);`
	`126`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`131`	`127`
`132`	`128`	`foreach (X509Certificate2 cert1 in collection)`
`133`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,8 @@ public static ReplyMessage RunTransaction(`
`91`	`91`	`logger.LogInfo("Loading certificate for " + config.KeyAlias);`
`92`	`92`	`}`
`93`	`93`
`94`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`95`		`-`
`96`	`94`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`97`		`- collection.Add(userCertificate);`
	`95`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`98`	`96`
`99`	`97`	`X509Certificate2 newMerchantCert = null;`
`100`	`98`	`X509Certificate2 newCybsCert = null;`
`@@ -127,10 +125,8 @@ public static ReplyMessage RunTransaction(`
`127`	`125`	`}`
`128`	`126`	`else`
`129`	`127`	`{`
`130`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`131`		`-`
`132`	`128`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`133`		`- collection.Add(userCertificate);`
	`129`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`134`	`130`
`135`	`131`	`foreach (X509Certificate2 cert1 in collection)`
`136`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,8 @@ public static XmlDocument RunTransaction(`
`106`	`106`	`logger.LogInfo("Loading certificate for "+ config.KeyAlias);`
`107`	`107`	`}`
`108`	`108`
`109`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`110`		`-`
`111`	`109`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`112`		`- collection.Add(userCertificate);`
	`110`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`113`	`111`
`114`	`112`	`X509Certificate2 newMerchantCert = null;`
`115`	`113`	`X509Certificate2 newCybsCert = null;`
`@@ -142,10 +140,8 @@ public static XmlDocument RunTransaction(`
`142`	`140`	`}`
`143`	`141`	`else`
`144`	`142`	`{`
`145`		`- X509Certificate2 userCertificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`146`		`-`
`147`	`143`	`X509Certificate2Collection collection = new X509Certificate2Collection();`
`148`		`- collection.Add(userCertificate);`
	`144`	`+ collection.Import(keyFilePath, new NetworkCredential(string.Empty, config.EffectivePassword).Password, X509KeyStorageFlags.MachineKeySet \| X509KeyStorageFlags.Exportable \| X509KeyStorageFlags.PersistKeySet);`
`149`	`145`
`150`	`146`	`foreach (X509Certificate2 cert1 in collection)`
`151`	`147`	`{`