Skip to content

Commit 6b32169

Browse files
author
shabtaisharon
committed
Merge pull request #164 from rpmoore/hash_fixes
Updating the hashes so that the return the correct hash providers.
2 parents 361deef + 22214a5 commit 6b32169

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/SHA256Hasher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class SHA256Hasher extends DigestHasher {
77
@Override
88
MessageDigest getDigest() {
99
try {
10-
return MessageDigest.getInstance("SHA256");
10+
return MessageDigest.getInstance("SHA-256");
1111
} catch (final NoSuchAlgorithmException e) {
1212
throw new RuntimeException(e);
1313
}

ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/SHA512Hasher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class SHA512Hasher extends DigestHasher{
77
@Override
88
MessageDigest getDigest() {
99
try {
10-
return MessageDigest.getInstance("SHA512");
10+
return MessageDigest.getInstance("SHA-512");
1111
} catch (final NoSuchAlgorithmException e) {
1212
throw new RuntimeException(e);
1313
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.spectralogic.ds3client.utils.hashing;
2+
3+
import org.junit.Test;
4+
5+
import static org.hamcrest.CoreMatchers.is;
6+
import static org.junit.Assert.assertThat;
7+
8+
public class Sha256Hash_Test {
9+
@Test
10+
public void calculateSha256() {
11+
final SHA256Hasher hasher = new SHA256Hasher();
12+
13+
assertThat(hasher.digest(), is("47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="));
14+
}
15+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.spectralogic.ds3client.utils.hashing;
2+
3+
import org.junit.Test;
4+
5+
import static org.hamcrest.CoreMatchers.is;
6+
import static org.junit.Assert.assertThat;
7+
8+
public class Sha512Hash_Test {
9+
@Test
10+
public void calculateSha512() {
11+
final SHA512Hasher hasher = new SHA512Hasher();
12+
13+
assertThat(hasher.digest(), is("z4PhNX7vuL3xVChQ1m2AB9Yg5AULVxXcg/SpIdNs6c5H0NE8XYXysP+DGNKHfuwvY7kxvUdBeoGlODJ6+SfaPg=="));
14+
}
15+
}

0 commit comments

Comments
 (0)