Skip to content

Commit 86b74bc

Browse files
committed
Fix hash class
(cherry picked from commit 5322c50)
1 parent 2e4fe82 commit 86b74bc

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

gamutils/src/main/java/com/genexus/gam/GamUtilsEO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public class GamUtilsEO {
1616

1717
//**HASH**//
1818
public static String sha512(String plainText) {
19-
return Hash.sha512(plainText);
19+
return Hash.hash(plainText, Hash.SHA512);
2020
}
2121

2222
public static String sha256(String plainText) {
23-
return Hash.sha256(plainText);
23+
return Hash.hash(plainText, Hash.SHA256);
2424
}
2525

2626
//**ENCRYPTION**//

gamutils/src/main/java/com/genexus/gam/utils/cryptography/Hash.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,24 @@
99

1010
import java.nio.charset.StandardCharsets;
1111

12-
public class Hash {
12+
public enum Hash {
1313

14-
private static Logger logger = LogManager.getLogger(Hash.class);
14+
SHA256, SHA512;
1515

16-
public static String sha512(String plainText) {
17-
logger.debug("sha512");
18-
return internalHash(new SHA512Digest(), plainText);
19-
}
16+
private static final Logger logger = LogManager.getLogger(Hash.class);
2017

21-
public static String sha256(String plainText)
18+
public static String hash(String plainText, Hash hash)
2219
{
23-
logger.debug("sha256");
24-
return internalHash(new SHA256Digest(), plainText);
20+
switch (hash)
21+
{
22+
case SHA256:
23+
return internalHash(new SHA256Digest(), plainText);
24+
case SHA512:
25+
return internalHash(new SHA512Digest(), plainText);
26+
default:
27+
logger.error("unrecognized hash");
28+
return "";
29+
}
2530
}
2631

2732
private static String internalHash(Digest digest, String plainText)

0 commit comments

Comments
 (0)