Skip to content

Commit 5147801

Browse files
authored
Merge pull request #32691 from abutch3r/305270-jpa-sha-256
Replace `SHA256` with SHA-256 for JPA
2 parents ae5dbfd + adc7094 commit 5147801

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

dev/com.ibm.ws.jpa.container.ormdiagnostics/src/com/ibm/ws/jpa/diagnostics/class_scanner/ano/EntityMappingsScannerResults.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.ibm.ws.common.crypto.CryptoUtils;
3333

3434
public class EntityMappingsScannerResults {
35-
private final String shaDigestAlg = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA256;
35+
private final String shaDigestAlg = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA_256;
3636
public static final String KEY_SHA256HASH = "SHA256HASH"; // Value is a String
3737
public static final String KEY_CITXML = "CITXML"; // Value is byte[]
3838

dev/com.ibm.ws.jpa.container.ormdiagnostics/src/com/ibm/ws/jpa/diagnostics/ormparser/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
public final class Constants {
1919
public final static String JVM_Property_ORMXML_DIGEST_ALGORITHM = "jpaormviewer.ormxml.digest.algorithm";
20-
public final static String DEFAULT_DIGEST_ALGORITHM = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA256;
20+
public final static String DEFAULT_DIGEST_ALGORITHM = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA_256;
2121

2222
public final static String JPA_10_JAXB_PACKAGE = "com.ibm.ws.jpa.diagnostics.ormparser.jaxb.orm10xml";
2323
public final static String JPA_20_JAXB_PACKAGE = "com.ibm.ws.jpa.diagnostics.ormparser.jaxb.orm20xml";

dev/com.ibm.ws.jpa.container.ormdiagnostics/src/com/ibm/ws/jpa/diagnostics/puparser/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
public final class Constants {
1919
public final static String JVM_Property_PXML_DIGEST_ALGORITHM = "jpaormviewer.pxml.digest.algorithm";
20-
public final static String DEFAULT_DIGEST_ALGORITHM = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA256;
20+
public final static String DEFAULT_DIGEST_ALGORITHM = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA_256;
2121

2222
public final static String JPA_10_JAXB_PACKAGE = "com.ibm.ws.jpa.diagnostics.puparser.jaxb.puxml10";
2323
public final static String JPA_20_JAXB_PACKAGE = "com.ibm.ws.jpa.diagnostics.puparser.jaxb.puxml20";

dev/com.ibm.ws.jpa.container.ormdiagnostics/src/com/ibm/ws/jpa/diagnostics/utils/encapsulation/EncapsulatedData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
import com.ibm.ws.common.crypto.CryptoUtils;
4545

4646
public class EncapsulatedData {
47-
private final String shaDigestAlg = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA256;
47+
private final String shaDigestAlg = CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA_256;
4848
public static EncapsulatedData createEncapsulatedData(String name, String id, byte[] data) throws Exception {
49-
return createEncapsulatedData(name, id, CompressionType.GZIP, CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA256, data);
49+
return createEncapsulatedData(name, id, CompressionType.GZIP, CryptoUtils.MESSAGE_DIGEST_ALGORITHM_SHA_256, data);
5050
}
5151

5252
public static EncapsulatedData createEncapsulatedData(String name, String id, CompressionType ct,

0 commit comments

Comments
 (0)