Skip to content

Issue 1818: Add support for SHA-256 and SHA-512 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 3, 2021
Merged

Issue 1818: Add support for SHA-256 and SHA-512 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f10c0a
Add support for SHA-256 and SHA-512
sainalshah Jan 1, 2021
98022da
Apply suggestions from code review
carlspring Jan 3, 2021
3a16edc
Update src/test/java/org/carlspring/commons/io/MultipleDigestInputStr…
carlspring Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/main/java/org/carlspring/commons/encryption/EncryptionAlgorithmsEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ public enum EncryptionAlgorithmsEnum

MD5("MD5", ".md5"),

SHA1("SHA-1", ".sha1");
SHA1("SHA-1", ".sha1"),

SHA256("SHA-256", ".sha256"),

SHA512("SHA-512", ".sha512");


private String extension;
Expand Down Expand Up @@ -55,6 +59,14 @@ public static EncryptionAlgorithmsEnum fromAlgorithm(String algorithm)
{
return SHA1;
}
if (algorithm.equals(SHA256.getAlgorithm()))
{
return SHA256;
}
if (algorithm.equals(SHA512.getAlgorithm()))
{
return SHA512;
}

throw new IOException("Unsupported digest algorithm!");
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/carlspring/commons/io/MultipleDigestInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ public class MultipleDigestInputStream
{

private static final String[] DEFAULT_ALGORITHMS = { EncryptionAlgorithmsEnum.MD5.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA1.getAlgorithm() };
EncryptionAlgorithmsEnum.SHA1.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA256.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA512.getAlgorithm() };

private Map<String, MessageDigest> digests = new LinkedHashMap<>();

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/carlspring/commons/io/MultipleDigestOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ public class MultipleDigestOutputStream extends FilterOutputStream
{

private static final String[] DEFAULT_ALGORITHMS = { EncryptionAlgorithmsEnum.MD5.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA1.getAlgorithm() };
EncryptionAlgorithmsEnum.SHA1.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA256.getAlgorithm(),
EncryptionAlgorithmsEnum.SHA512.getAlgorithm() };

private Map<String, MessageDigest> digests = new LinkedHashMap<>();

Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/carlspring/commons/io/MultipleDigestInputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,20 @@ void testRead()

final String md5 = mdis.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.MD5.getAlgorithm());
final String sha1 = mdis.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA1.getAlgorithm());
final String sha256 = mdis.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA256.getAlgorithm());
final String sha512 = mdis.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA512.getAlgorithm());

assertEquals("693188a2fb009bf2a87afcbca95cfcd6", md5, "Incorrect MD5 sum!");
assertEquals("6ed7c74babd1609cb11836279672ade14a8748c1", sha1, "Incorrect SHA-1 sum!");
assertEquals("4716861ef13609f87cc9ba9d0f9cba6c1d7894dd21cfca2f965631d6933fffbb", sha256, "Incorrect SHA-256 sum!");
assertEquals("d87e40392a0749350059a366f3cc2e72a008b5feae3a845528660649545d8388b86ad540498756d9c5eb9365c5940c4146a8f5302d1ed42a253b90f9ec438deb",
sha512,
"Incorrect SHA-512 sum!");

logger.debug("MD5: {}", md5);
logger.debug("SHA1: {}", sha1);
logger.debug("SHA1: {}", sha256);
logger.debug("SHA1: {}", sha512);
}

@Test
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/org/carlspring/commons/io/MultipleDigestOutputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,42 @@ void testWrite()

final String md5 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.MD5.getAlgorithm());
final String sha1 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA1.getAlgorithm());
final String sha256 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA256.getAlgorithm());
final String sha512 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA512.getAlgorithm());

assertEquals("120ea8a25e5d487bf68b5f7096440019", md5, "Incorrect MD5 sum!");
assertEquals("afa6c8b3a2fae95785dc7d9685a57835d703ac88", sha1, "Incorrect SHA-1 sum!");
assertEquals("a8a2f6ebe286697c527eb35a58b5539532e9b3ae3b64d4eb0a46fb657b41562c", sha256, "Incorrect SHA-256 sum!");
assertEquals("f3bf9aa70169e4ab5339f20758986538fe6c96d7be3d184a036cde8161105fcf53516428fa096ac56247bb88085b0587d5ec8e56a6807b1af351305b2103d74b",
sha512,
"Incorrect SHA-512 sum!");

mdos.close();

logger.debug("MD5: " + md5);
logger.debug("SHA1: " + sha1);
logger.debug("SHA256: " + sha256);
logger.debug("SHA512: " + sha512);

Path md5File = filePath.resolveSibling(filePath.getFileName() + EncryptionAlgorithmsEnum.MD5.getExtension());
Path sha1File = filePath.resolveSibling(filePath.getFileName() + EncryptionAlgorithmsEnum.SHA1.getExtension());
Path sha256File = filePath.resolveSibling(filePath.getFileName() + EncryptionAlgorithmsEnum.SHA256.getExtension());
Path sha512File = filePath.resolveSibling(filePath.getFileName() + EncryptionAlgorithmsEnum.SHA512.getExtension());

assertTrue(Files.exists(md5File), "Failed to create md5 checksum filePath!");
assertTrue(Files.exists(sha1File), "Failed to create sha1 checksum filePath!");
assertTrue(Files.exists(sha256File), "Failed to create sha256 checksum filePath!");
assertTrue(Files.exists(sha512File), "Failed to create sha512 checksum filePath!");

String md5ReadIn = MessageDigestUtils.readChecksumFile(md5File.toString());
String sha1ReadIn = MessageDigestUtils.readChecksumFile(sha1File.toString());
String sha256ReadIn = MessageDigestUtils.readChecksumFile(sha256File.toString());
String sha512ReadIn = MessageDigestUtils.readChecksumFile(sha512File.toString());

assertEquals(md5, md5ReadIn, "MD5 checksum filePath contains incorrect checksum!");
assertEquals(sha1, sha1ReadIn, "SHA-1 checksum filePath contains incorrect checksum!");
assertEquals(sha256, sha256ReadIn, "SHA-256 checksum filePath contains incorrect checksum!");
assertEquals(sha512, sha512ReadIn, "SHA-512 checksum filePath contains incorrect checksum!");
}

@Test
Expand Down Expand Up @@ -135,12 +151,20 @@ void testConcatenatedWrites()

final String md5 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.MD5.getAlgorithm());
final String sha1 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA1.getAlgorithm());
final String sha256 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA256.getAlgorithm());
final String sha512 = mdos.getMessageDigestAsHexadecimalString(EncryptionAlgorithmsEnum.SHA512.getAlgorithm());

logger.debug("MD5: {}", md5);
logger.debug("SHA1: {}", sha1);
logger.debug("SHA256: {}", sha256);
logger.debug("SHA512: {}", sha512);

assertEquals("693188a2fb009bf2a87afcbca95cfcd6", md5, "Incorrect MD5 sum!");
assertEquals("6ed7c74babd1609cb11836279672ade14a8748c1", sha1, "Incorrect SHA-1 sum!");
assertEquals("4716861ef13609f87cc9ba9d0f9cba6c1d7894dd21cfca2f965631d6933fffbb", sha256, "Incorrect SHA-256 sum!");
assertEquals("d87e40392a0749350059a366f3cc2e72a008b5feae3a845528660649545d8388b86ad540498756d9c5eb9365c5940c4146a8f5302d1ed42a253b90f9ec438deb",
sha512,
"Incorrect SHA-512 sum!");
}

}