diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionAlgorithm.java index 340ee59..3bc3758 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionAlgorithm.java @@ -22,7 +22,7 @@ public enum AsymmetricEncryptionAlgorithm { */ public static AsymmetricEncryptionAlgorithm getAsymmetricEncryptionAlgorithm(String asymmetricEncryptionAlgorithm, Error error) { - switch (asymmetricEncryptionAlgorithm) { + switch (asymmetricEncryptionAlgorithm.toUpperCase().trim()) { case "RSA": return AsymmetricEncryptionAlgorithm.RSA; default: diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionPadding.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionPadding.java index c4a6901..4fad285 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionPadding.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricEncryptionPadding.java @@ -21,7 +21,7 @@ public enum AsymmetricEncryptionPadding { */ public static AsymmetricEncryptionPadding getAsymmetricEncryptionPadding(String asymmetricEncryptionPadding, Error error) { - switch (asymmetricEncryptionPadding) { + switch (asymmetricEncryptionPadding.toUpperCase().trim()) { case "NOPADDING": return AsymmetricEncryptionPadding.NOPADDING; case "OAEPPADDING": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricSigningAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricSigningAlgorithm.java index 5e8e185..fbde99a 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricSigningAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/utils/AsymmetricSigningAlgorithm.java @@ -22,7 +22,7 @@ public enum AsymmetricSigningAlgorithm { */ public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(String asymmetricSigningAlgorithm, Error error) { - switch (asymmetricSigningAlgorithm) { + switch (asymmetricSigningAlgorithm.toUpperCase().trim()) { case "RSA": return AsymmetricSigningAlgorithm.RSA; case "ECDSA": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/hash/utils/HashAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/hash/utils/HashAlgorithm.java index 3ffc1a4..efb0998 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/hash/utils/HashAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/hash/utils/HashAlgorithm.java @@ -20,7 +20,7 @@ public enum HashAlgorithm { * @return HashAlgorithm enum representation */ public static HashAlgorithm getHashAlgorithm(String hashAlgorithm, Error error) { - switch (hashAlgorithm) { + switch (hashAlgorithm.toUpperCase().trim()) { case "MD5": return HashAlgorithm.MD5; case "SHA1": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2HashType.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2HashType.java index 85cace9..5212733 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2HashType.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2HashType.java @@ -8,7 +8,7 @@ public enum Argon2HashType { ARGON2_d, ARGON2_i, ARGON2_id; public static Argon2HashType getArgon2HashType(String argon2HashType, Error error) { - switch (argon2HashType) { + switch (argon2HashType.trim()) { case "ARGON2_d": return Argon2HashType.ARGON2_d; case "ARGON2_i": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2Version.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2Version.java index 91d4184..8a5a946 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2Version.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/Argon2Version.java @@ -9,7 +9,7 @@ public enum Argon2Version { ARGON2_VERSION_10, ARGON2_VERSION_13; public static Argon2Version getArgon2Version(String argon2Version, Error error) { - switch (argon2Version) { + switch (argon2Version.toUpperCase().trim()) { case "ARGON2_VERSION_10": return Argon2Version.ARGON2_VERSION_10; case "ARGON2_VERSION_13": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/PasswordDerivationAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/PasswordDerivationAlgorithm.java index b286c50..05ce171 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/PasswordDerivationAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/passwordDerivation/PasswordDerivationAlgorithm.java @@ -21,7 +21,7 @@ public enum PasswordDerivationAlgorithm { */ public static PasswordDerivationAlgorithm getPasswordDerivationAlgorithm(String passwordDerivationAlgorithm, Error error) { - switch (passwordDerivationAlgorithm) { + switch (passwordDerivationAlgorithm.trim()) { case "SCrypt": return PasswordDerivationAlgorithm.SCrypt; case "Bcrypt": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockAlgorithm.java index 2007472..3d37cf4 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockAlgorithm.java @@ -20,7 +20,7 @@ public enum SymmetricBlockAlgorithm { * @return SymmetricBlockAlgorithm enum representaton */ public static SymmetricBlockAlgorithm getSymmetricBlockAlgorithm(String symmetricBlockAlgorithm, Error error) { - switch (symmetricBlockAlgorithm) { + switch (symmetricBlockAlgorithm.toUpperCase().trim()) { case "AES": return SymmetricBlockAlgorithm.AES; case "BLOWFISH": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockMode.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockMode.java index 7b81dbd..7b45e6c 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockMode.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockMode.java @@ -21,7 +21,7 @@ public enum SymmetricBlockMode { * @return SymmetricBlockMode enum representation */ public static SymmetricBlockMode getSymmetricBlockMode(String symmetricBlockMode, Error error) { - switch (symmetricBlockMode) { + switch (symmetricBlockMode.toUpperCase().trim()) { case "ECB": return SymmetricBlockMode.ECB; case "CBC": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockPadding.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockPadding.java index f6e91df..647b7ed 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockPadding.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricBlockPadding.java @@ -20,7 +20,7 @@ public enum SymmetricBlockPadding { * @return SymmetricBlockPadding enum representation */ public static SymmetricBlockPadding getSymmetricBlockPadding(String symmetricBlockPadding, Error error) { - switch (symmetricBlockPadding) { + switch (symmetricBlockPadding.toUpperCase().trim()) { case "NOPADDING": return SymmetricBlockPadding.NOPADDING; case "PKCS7PADDING": diff --git a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricStreamAlgorithm.java b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricStreamAlgorithm.java index 7a30c09..ffc00d9 100644 --- a/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricStreamAlgorithm.java +++ b/GeneXusCryptography/src/main/java/com/genexus/cryptography/symmetric/utils/SymmetricStreamAlgorithm.java @@ -19,7 +19,7 @@ public enum SymmetricStreamAlgorithm { * @return SymmetricStreamAlgorithm enum representation */ public static SymmetricStreamAlgorithm getSymmetricStreamAlgorithm(String symmetricStreamAlgorithm, Error error) { - switch (symmetricStreamAlgorithm) { + switch (symmetricStreamAlgorithm.toUpperCase().trim()) { case "RC4": return SymmetricStreamAlgorithm.RC4; case "HC128": diff --git a/GeneXusFtps/src/main/java/com/genexus/ftps/utils/FtpsProtocol.java b/GeneXusFtps/src/main/java/com/genexus/ftps/utils/FtpsProtocol.java index 3410968..7544a0b 100644 --- a/GeneXusFtps/src/main/java/com/genexus/ftps/utils/FtpsProtocol.java +++ b/GeneXusFtps/src/main/java/com/genexus/ftps/utils/FtpsProtocol.java @@ -7,7 +7,7 @@ public enum FtpsProtocol { TLS1_0, TLS1_1, TLS1_2, SSLv2, SSLv3,; public static FtpsProtocol getFtpsProtocol(String ftpsProtocol, Error error) { - switch (ftpsProtocol.toUpperCase().trim()) { + switch (ftpsProtocol.trim()) { case "TLS1_0": return TLS1_0; case "TLS1_1": diff --git a/GeneXusJWT/src/main/java/com/genexus/JWT/claims/RegisteredClaim.java b/GeneXusJWT/src/main/java/com/genexus/JWT/claims/RegisteredClaim.java index cfdee90..fe3c8b2 100644 --- a/GeneXusJWT/src/main/java/com/genexus/JWT/claims/RegisteredClaim.java +++ b/GeneXusJWT/src/main/java/com/genexus/JWT/claims/RegisteredClaim.java @@ -36,7 +36,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; case "exp": @@ -58,7 +58,7 @@ public static RegisteredClaim getRegisteredClaim(String registeredClaim, Error e } public static boolean exists(String value) { - switch (value) { + switch (value.trim()) { case "iss": case "exp": case "sub": @@ -73,7 +73,7 @@ public static boolean exists(String value) { } public static boolean isTimeValidatingClaim(String claimKey) { - switch (claimKey) { + switch (claimKey.trim()) { case "iat": case "exp": case "nbf": diff --git a/GeneXusJWT/src/main/java/com/genexus/JWT/utils/JWTAlgorithm.java b/GeneXusJWT/src/main/java/com/genexus/JWT/utils/JWTAlgorithm.java index 0c5a87c..88025a5 100644 --- a/GeneXusJWT/src/main/java/com/genexus/JWT/utils/JWTAlgorithm.java +++ b/GeneXusJWT/src/main/java/com/genexus/JWT/utils/JWTAlgorithm.java @@ -31,7 +31,7 @@ public static String valueOf(JWTAlgorithm jWTAlgorithm, Error error) { } public static JWTAlgorithm getJWTAlgorithm(String jWTAlgorithm, Error error) { - switch (jWTAlgorithm) { + switch (jWTAlgorithm.toUpperCase().trim()) { case "HS256": return JWTAlgorithm.HS256; case "HS512": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java index 4f9971f..39db282 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/AsymmetricSigningAlgorithm.java @@ -22,7 +22,7 @@ public enum AsymmetricSigningAlgorithm { */ public static AsymmetricSigningAlgorithm getAsymmetricSigningAlgorithm(String asymmetricSigningAlgorithm, Error error) { - switch (asymmetricSigningAlgorithm) { + switch (asymmetricSigningAlgorithm.toUpperCase().trim()) { case "RSA": return AsymmetricSigningAlgorithm.RSA; case "ECDSA": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java index f9bd785..3927703 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/CanonicalizerWrapper.java @@ -22,7 +22,7 @@ public enum CanonicalizerWrapper { * @return CanonicalizerWrapper enum representation */ public static CanonicalizerWrapper getCanonicalizerWrapper(String canonicalizerWrapper, Error error) { - switch (canonicalizerWrapper) { + switch (canonicalizerWrapper.trim()) { case "C14n_WITH_COMMENTS": return CanonicalizerWrapper.ALGO_ID_C14N_WITH_COMMENTS; case "C14n_OMIT_COMMENTS": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java index 47e3c9f..ecf6982 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/KeyInfoType.java @@ -7,7 +7,7 @@ public enum KeyInfoType { NONE, KeyValue, X509Certificate,; public static KeyInfoType getKeyInfoType(String keyInfoType, Error error) { - switch (keyInfoType) { + switch (keyInfoType.trim()) { case "NONE": return NONE; case "KeyValue": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java index 38a279b..476b28c 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/MessageDigestAlgorithmWrapper.java @@ -20,7 +20,7 @@ public enum MessageDigestAlgorithmWrapper { */ public static MessageDigestAlgorithmWrapper getMessageDigestAlgorithmWrapper(String messageDigestAlgorithmWrapper, Error error) { - switch (messageDigestAlgorithmWrapper) { + switch (messageDigestAlgorithmWrapper.toUpperCase().trim()) { case "SHA1": return MessageDigestAlgorithmWrapper.SHA1; case "SHA256": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java index 843ce49..d1fb587 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/TransformsWrapper.java @@ -18,7 +18,7 @@ public enum TransformsWrapper { * @return TransformsWrapper enum representation */ public static TransformsWrapper getTransformsWrapper(String transformsWrapper, Error error) { - switch (transformsWrapper) { + switch (transformsWrapper.toUpperCase().trim()) { case "ENVELOPED": return TransformsWrapper.ENVELOPED; case "ENVELOPING": diff --git a/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java b/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java index a2c9027..b432602 100644 --- a/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java +++ b/GeneXusXmlSignature/src/main/java/com/genexus/utils/XMLSignatureWrapper.java @@ -18,7 +18,7 @@ public enum XMLSignatureWrapper { * @return XMLSignatureWrapper enum representation */ public static XMLSignatureWrapper getXMLSignatureWrapper(String xMLSignatureWrapper, Error error) { - switch (xMLSignatureWrapper) { + switch (xMLSignatureWrapper.toUpperCase().trim()) { case "RSA_SHA1": return RSA_SHA1; case "RSA_SHA256": diff --git a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/config/AvailableEncoding.java b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/config/AvailableEncoding.java index 3bee980..063f3e7 100644 --- a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/config/AvailableEncoding.java +++ b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/config/AvailableEncoding.java @@ -8,7 +8,7 @@ public enum AvailableEncoding { public static AvailableEncoding getAvailableEncoding(String encoding, Error error) { encoding = encoding.replace("-", "_"); encoding = encoding.toUpperCase(); - switch (encoding) { + switch (encoding.trim()) { case "UTF_8": return UTF_8; case "UTF_16": diff --git a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/keys/SymmetricKeyType.java b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/keys/SymmetricKeyType.java index ca45c57..c8dd87f 100644 --- a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/keys/SymmetricKeyType.java +++ b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/keys/SymmetricKeyType.java @@ -20,7 +20,7 @@ public enum SymmetricKeyType { * @return SymmetricKeyType enum representation */ public static SymmetricKeyType getSymmetricKeyType(String symmetricKeyType, Error error) { - switch (symmetricKeyType) { + switch (symmetricKeyType.toUpperCase().trim()) { case "GENERICRANDOM": return SymmetricKeyType.GENERICRANDOM; default: