Merge pull request #51 from lunasoft/hotfix/certificados

Fix RSAParameters
lunasoft · Oct 13, 2023 · 7a18c00 · 7a18c00
2 parents e288067 + 47952ae
commit 7a18c00
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/SW.Tools/Helpers/SignUtils.cs b/SW.Tools/Helpers/SignUtils.cs
@@ -1,5 +1,6 @@
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Math;
 using SW.Tools.Services.Fiscal;
 using System;
 using System.Collections;
@@ -136,14 +137,25 @@ private static RSAParameters ToRSAParameters(RsaPrivateCrtKeyParameters privKey)
             RSAParameters rp = new RSAParameters();
             rp.Modulus = privKey.Modulus.ToByteArrayUnsigned();
             rp.Exponent = privKey.PublicExponent.ToByteArrayUnsigned();
-            rp.D = privKey.Exponent.ToByteArrayUnsigned();
             rp.P = privKey.P.ToByteArrayUnsigned();
             rp.Q = privKey.Q.ToByteArrayUnsigned();
-            rp.DP = privKey.DP.ToByteArrayUnsigned();
-            rp.DQ = privKey.DQ.ToByteArrayUnsigned();
-            rp.InverseQ = privKey.QInv.ToByteArrayUnsigned();
+            rp.D = ConvertRSAParametersField(privKey.Exponent, rp.Modulus.Length);
+            rp.DP = ConvertRSAParametersField(privKey.DP, rp.P.Length);
+            rp.DQ = ConvertRSAParametersField(privKey.DQ, rp.Q.Length);
+            rp.InverseQ = ConvertRSAParametersField(privKey.QInv, rp.Q.Length);
             return rp;
         }
+        private static byte[] ConvertRSAParametersField(BigInteger n, int size)
+        {
+            byte[] bs = n.ToByteArrayUnsigned();
+            if (bs.Length == size)
+                return bs;
+            if (bs.Length > size)
+                throw new ArgumentException("Specified size too small", "size");
+            byte[] padded = new byte[size];
+            Array.Copy(bs, 0, padded, size - bs.Length, bs.Length);
+            return padded;
+        }
         private static string ToHexString(byte[] data)
         {
             if (data != null)

diff --git a/SW.Tools/Properties/AssemblyInfo.cs b/SW.Tools/Properties/AssemblyInfo.cs
@@ -35,6 +35,6 @@
 
 
 
-[assembly: AssemblyVersion("1.0.9.2")]
-[assembly: AssemblyFileVersion("1.0.9.2")]
+[assembly: AssemblyVersion("1.0.9.3")]
+[assembly: AssemblyFileVersion("1.0.9.3")]
 
diff --git a/SW.ToolsUT/UT_Tools_Sign.cs b/SW.ToolsUT/UT_Tools_Sign.cs
@@ -37,7 +37,6 @@ public void UT_Tools_Sign_CrearPFX_OK()
             X509Certificate x509 = new X509Certificate(pfx, password);
             Assert.IsTrue(x509.GetPublicKey() != null);
         }
-
         [TestMethod]
         [ExpectedException(typeof(Exception), "Los datos del Certificado CER KEY o Password son incorrectos.No es posible leer la llave privada.")]
         public void UT_Tools_Sign_CrearPFX_ERROR()