diff --git a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionAlgorithm.cs
index 12c82a3..cd80ce1 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionAlgorithm.cs
@@ -34,7 +34,7 @@ public class AsymmetricEncryptionAlgorithmUtils
         /// <returns>AsymmetricEncryptionAlgorithm enum representation</returns>
         public static AsymmetricEncryptionAlgorithm getAsymmetricEncryptionAlgorithm(string asymmetricEncryptionAlgorithm, Error error)
         {
-            switch (asymmetricEncryptionAlgorithm)
+            switch (asymmetricEncryptionAlgorithm.ToUpper().Trim())
             {
                 case "RSA":
                     return AsymmetricEncryptionAlgorithm.RSA;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionPadding.cs b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionPadding.cs
index dc602e7..b766db5 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionPadding.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricEncryptionPadding.cs
@@ -32,7 +32,7 @@ public class AsymmetricEncryptionPaddingUtils
         /// <returns>AsymmetricEncryptionPadding enum representation</returns>
         public static AsymmetricEncryptionPadding getAsymmetricEncryptionPadding(string asymmetricEncryptionPadding, Error error)
         {
-            switch (asymmetricEncryptionPadding)
+            switch (asymmetricEncryptionPadding.ToUpper().Trim())
             {
                 case "NOPADDING":
                     return AsymmetricEncryptionPadding.NOPADDING;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricSigningAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricSigningAlgorithm.cs
index 1dd1099..7597e18 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricSigningAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/AsymmetricUtils/AsymmetricSigningAlgorithm.cs
@@ -34,7 +34,7 @@ public class AsymmetricSigningAlgorithmUtils
         /// <returns>AsymmetricSigningAlgorithm enum representation</returns>
         public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(string asymmetricSigningAlgorithm, Error error)
         {
-            switch (asymmetricSigningAlgorithm)
+            switch (asymmetricSigningAlgorithm.ToUpper().Trim())
             {
                 case "RSA":
                     return AsymmetricSigningAlgorithm.RSA;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/HashUtils/HashAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/HashUtils/HashAlgorithm.cs
index 89d399a..93d8a36 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/HashUtils/HashAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/HashUtils/HashAlgorithm.cs
@@ -35,7 +35,7 @@ public static class HashAlgorithmUtils
         /// <returns>HashAlgorithm enum representation</returns>
         public static HashAlgorithm getHashAlgorithm(string hashAlgorithm, Error error)
         {
-            switch (hashAlgorithm)
+            switch (hashAlgorithm.ToUpper().Trim())
             {
                 case "MD5":
                     return HashAlgorithm.MD5;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/PasswordDerivation/PasswordDerivationAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/PasswordDerivation/PasswordDerivationAlgorithm.cs
index 5859d4d..0499cc7 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/PasswordDerivation/PasswordDerivationAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/PasswordDerivation/PasswordDerivationAlgorithm.cs
@@ -32,7 +32,7 @@ public class PasswordDerivationAlgorithmUtils
         /// <returns>PasswordDerivationAlgorithm enum representation</returns>
         public static PasswordDerivationAlgorithm getPasswordDerivationAlgorithm(string passwordDerivationAlgorithm, Error error)
         {
-            switch (passwordDerivationAlgorithm)
+            switch (passwordDerivationAlgorithm.Trim())
             {
                 case "SCrypt":
                     return PasswordDerivationAlgorithm.SCrypt;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockAlgorithm.cs
index 910365b..148a099 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockAlgorithm.cs
@@ -33,7 +33,7 @@ public class SymmetricBlockAlgorithmUtils
         /// <returns>SymmetricBlockAlgorithm enum representaton</returns>
         public static SymmetricBlockAlgorithm getSymmetricBlockAlgorithm(string symmetricBlockAlgorithm, Error error)
         {
-            switch (symmetricBlockAlgorithm)
+            switch (symmetricBlockAlgorithm.ToUpper().Trim())
             {
                 case "AES":
                     return SymmetricBlockAlgorithm.AES;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockMode.cs b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockMode.cs
index 739c791..b226ac4 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockMode.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockMode.cs
@@ -34,7 +34,7 @@ public class SymmetricBlockModeUtils
         /// <returns>SymmetricBlockMode enum representation</returns>
         public static SymmetricBlockMode getSymmetricBlockMode(string symmetricBlockMode, Error error)
         {
-            switch (symmetricBlockMode)
+            switch (symmetricBlockMode.ToUpper().Trim())
             {
                 case "ECB":
                     return SymmetricBlockMode.ECB;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockPadding.cs b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockPadding.cs
index 36eb93b..7db0c21 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockPadding.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricBlockPadding.cs
@@ -33,7 +33,7 @@ public class SymmetricBlockPaddingUtils
         /// <returns>SymmetricBlockPadding enum representation</returns>
         public static SymmetricBlockPadding getSymmetricBlockPadding(string symmetricBlockPadding, Error error)
         {
-            switch (symmetricBlockPadding)
+            switch (symmetricBlockPadding.ToUpper().Trim())
             {
                 case "NOPADDING":
                     return SymmetricBlockPadding.NOPADDING;
diff --git a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricStreamAlgorithm.cs b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricStreamAlgorithm.cs
index 0efb592..f4a18c9 100644
--- a/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricStreamAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusCryptography/SymmetricUtils/SymmetricStreamAlgorithm.cs
@@ -33,7 +33,7 @@ public class SymmetricStreamAlgorithmUtils
         /// <returns>SymmetricStreamAlgorithm enum representation</returns>
         public static SymmetricStreamAlgorithm getSymmetricStreamAlgorithm(String symmetricStreamAlgorithm, Error error)
         {
-            switch (symmetricStreamAlgorithm)
+            switch (symmetricStreamAlgorithm.ToUpper().Trim())
             {
                 case "RC4":
                     return SymmetricStreamAlgorithm.RC4;
diff --git a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtpsUtils/FtpsProtocol.cs b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtpsUtils/FtpsProtocol.cs
index 1b75a5f..8479245 100644
--- a/dotnet/dotnetframework/GeneXusFtps/GeneXusFtpsUtils/FtpsProtocol.cs
+++ b/dotnet/dotnetframework/GeneXusFtps/GeneXusFtpsUtils/FtpsProtocol.cs
@@ -18,7 +18,7 @@ public class FtpsProtocolUtils
 		[SecuritySafeCritical]
 		public static FtpsProtocol getFtpsProtocol(String ftpsProtocol, Error error)
 		{
-			switch (ftpsProtocol.ToUpper().Trim())
+			switch (ftpsProtocol.Trim())
 			{
 				case "TLS1_0":
 					return FtpsProtocol.TLS1_0;
diff --git a/dotnet/dotnetframework/GeneXusJWT/JWTClaims/RegisteredClaim.cs b/dotnet/dotnetframework/GeneXusJWT/JWTClaims/RegisteredClaim.cs
index 56da472..df15b4c 100644
--- a/dotnet/dotnetframework/GeneXusJWT/JWTClaims/RegisteredClaim.cs
+++ b/dotnet/dotnetframework/GeneXusJWT/JWTClaims/RegisteredClaim.cs
@@ -44,7 +44,7 @@ public static string valueOf(RegisteredClaim registeredClaim, Error error)
 
         public static RegisteredClaim getRegisteredClaim(string registeredClaim, Error error)
         {
-            switch (registeredClaim)
+            switch (registeredClaim.Trim())
             {
                 case "iss":
                     return RegisteredClaim.iss;
@@ -68,7 +68,7 @@ public static RegisteredClaim getRegisteredClaim(string registeredClaim, Error e
 
         public static bool exists(string value)
         {
-            switch (value)
+            switch (value.Trim())
             {
                 case "iss":
                 case "exp":
@@ -85,7 +85,7 @@ public static bool exists(string value)
 
         public static bool isTimeValidatingClaim(string claimKey)
         {
-            switch (claimKey)
+            switch (claimKey.Trim())
             {
                 case "iat":
                 case "exp":
diff --git a/dotnet/dotnetframework/GeneXusJWT/Utils/JWTAlgorithm.cs b/dotnet/dotnetframework/GeneXusJWT/Utils/JWTAlgorithm.cs
index a9e310d..07d7dd1 100644
--- a/dotnet/dotnetframework/GeneXusJWT/Utils/JWTAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusJWT/Utils/JWTAlgorithm.cs
@@ -43,7 +43,7 @@ public static string valueOf(JWTAlgorithm jWTAlgorithm, Error error)
 
         public static JWTAlgorithm getJWTAlgorithm(string jWTAlgorithm, Error error)
         {
-            switch (jWTAlgorithm)
+            switch (jWTAlgorithm.ToUpper().Trim())
             {
                 case "HS256":
                     return JWTAlgorithm.HS256;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/AsymmetricSigningAlgorithm.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/AsymmetricSigningAlgorithm.cs
index bf89a3d..4063b77 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/AsymmetricSigningAlgorithm.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/AsymmetricSigningAlgorithm.cs
@@ -32,7 +32,7 @@ public class AsymmetricSigningAlgorithmUtils
         /// <returns>AsymmetricSigningAlgorithm enum representation</returns>
         public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(string asymmetricSigningAlgorithm, Error error)
         {
-            switch (asymmetricSigningAlgorithm)
+            switch (asymmetricSigningAlgorithm.ToUpper().Trim())
             {
                 case "RSA":
                     return AsymmetricSigningAlgorithm.RSA;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/CanonicalizerWrapper.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/CanonicalizerWrapper.cs
index 89a57f4..16c3ea2 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/CanonicalizerWrapper.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/CanonicalizerWrapper.cs
@@ -17,7 +17,7 @@ public class CanonicalizerWrapperUtils
     {
         public static CanonicalizerWrapper getCanonicalizerWrapper(string canonicalizerWrapper, Error error)
         {
-            switch (canonicalizerWrapper)
+            switch (canonicalizerWrapper.Trim())
             {
                 case "C14n_WITH_COMMENTS":
                     return CanonicalizerWrapper.ALGO_ID_C14N_WITH_COMMENTS;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/KeyInfoType.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/KeyInfoType.cs
index f6a257e..d131d54 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/KeyInfoType.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/KeyInfoType.cs
@@ -17,7 +17,7 @@ public class KeyInfoTypeUtils
     {
         public static KeyInfoType getKeyInfoType(string keyInfoType, Error error)
         {
-            switch (keyInfoType)
+            switch (keyInfoType.Trim())
             {
                 case "NONE":
                     return KeyInfoType.NONE;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/MessageDigestAlgorithmWrapper.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/MessageDigestAlgorithmWrapper.cs
index 58db7a9..36edb26 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/MessageDigestAlgorithmWrapper.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/MessageDigestAlgorithmWrapper.cs
@@ -18,7 +18,7 @@ public class MessageDigestAlgorithmWrapperUtils
         public static MessageDigestAlgorithmWrapper getMessageDigestAlgorithmWrapper(string messageDigestAlgorithmWrapper,
         Error error)
         {
-            switch (messageDigestAlgorithmWrapper)
+            switch (messageDigestAlgorithmWrapper.ToUpper().Trim())
             {
                 case "SHA1":
                     return MessageDigestAlgorithmWrapper.SHA1;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/TransformsWrapper.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/TransformsWrapper.cs
index 23b2530..d0de78d 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/TransformsWrapper.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/TransformsWrapper.cs
@@ -17,7 +17,7 @@ public class TransformsWrapperUtils
     {
         public static TransformsWrapper getTransformsWrapper(string transformsWrapper, Error error)
         {
-            switch (transformsWrapper)
+            switch (transformsWrapper.ToUpper().Trim())
             {
                 case "ENVELOPED":
                     return TransformsWrapper.ENVELOPED;
diff --git a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/XmlSignatureWrapper.cs b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/XmlSignatureWrapper.cs
index 3661a5d..9191d12 100644
--- a/dotnet/dotnetframework/GeneXusXmlSignature/Utils/XmlSignatureWrapper.cs
+++ b/dotnet/dotnetframework/GeneXusXmlSignature/Utils/XmlSignatureWrapper.cs
@@ -17,7 +17,7 @@ public class XMLSignatureWrapperUtils
     {
         public static XmlSignatureWrapper getXMLSignatureWrapper(string xMLSignatureWrapper, Error error)
         {
-            switch (xMLSignatureWrapper)
+            switch (xMLSignatureWrapper.ToUpper().Trim())
             {
                 case "RSA_SHA1":
                     return XmlSignatureWrapper.RSA_SHA1;
diff --git a/dotnet/dotnetframework/SecurityAPICommons/Config/AvailableEncoding.cs b/dotnet/dotnetframework/SecurityAPICommons/Config/AvailableEncoding.cs
index 2307212..9b5c7f8 100644
--- a/dotnet/dotnetframework/SecurityAPICommons/Config/AvailableEncoding.cs
+++ b/dotnet/dotnetframework/SecurityAPICommons/Config/AvailableEncoding.cs
@@ -21,7 +21,7 @@ public static AvailableEncoding getAvailableEncoding(string encoding, Error erro
         {
             encoding = encoding.Replace("-", "_");
             encoding = encoding.ToUpper();
-            switch (encoding)
+            switch (encoding.Trim())
             {
                 case "UTF_8":
                     return AvailableEncoding.UTF_8;
diff --git a/dotnet/dotnetframework/SecurityAPICommons/Keys/SymmetricKeyType.cs b/dotnet/dotnetframework/SecurityAPICommons/Keys/SymmetricKeyType.cs
index 0583eed..6a7a594 100644
--- a/dotnet/dotnetframework/SecurityAPICommons/Keys/SymmetricKeyType.cs
+++ b/dotnet/dotnetframework/SecurityAPICommons/Keys/SymmetricKeyType.cs
@@ -32,7 +32,7 @@ public class SymmetricKeyTypeUtils
         /// <returns>SymmetricKeyType enum representation</returns>
         public static SymmetricKeyType getSymmetricKeyType(string symmetricKeyType, Error error)
         {
-            switch (symmetricKeyType)
+            switch (symmetricKeyType.ToUpper().Trim())
             {
                 case "GENERICRANDOM":
                     return SymmetricKeyType.GENERICRANDOM;