WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #61 from cconlon/sha1alias 

JCE: add "SHA1" alias for MessageDigest SHA-1, for interop with Sun
pull/64/head
Daniel Pouzzner 2024-02-10 02:19:59 -05:00 committed by GitHub
parent 7898bb2531 4f1f3b5630
commit f14c85b6d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java
View File

@ -44,6 +44,8 @@ public final class WolfCryptProvider extends Provider {
if (FeatureDetect.ShaEnabled()) { if (FeatureDetect.ShaEnabled()) {
put("MessageDigest.SHA", put("MessageDigest.SHA",
"com.wolfssl.provider.jce.WolfCryptMessageDigestSha"); "com.wolfssl.provider.jce.WolfCryptMessageDigestSha");
put("MessageDigest.SHA1",
"com.wolfssl.provider.jce.WolfCryptMessageDigestSha");
put("MessageDigest.SHA-1", put("MessageDigest.SHA-1",
"com.wolfssl.provider.jce.WolfCryptMessageDigestSha"); "com.wolfssl.provider.jce.WolfCryptMessageDigestSha");
} }

9
src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java
View File

@ -58,12 +58,15 @@ public class WolfCryptMessageDigestShaTest {
assertNotNull(p); assertNotNull(p);
try { try {
/* Try "SHA" cipher string, for SUN interop */ /* Try "SHA" and "SHA1" cipher strings, for SUN interop */
MessageDigest sha = MessageDigest.getInstance("SHA", MessageDigest sha = MessageDigest.getInstance("SHA",
"wolfJCE"); "wolfJCE");
MessageDigest sha1 = MessageDigest.getInstance("SHA-1", MessageDigest sha1 = MessageDigest.getInstance("SHA1",
"wolfJCE"); "wolfJCE");
MessageDigest shaDash1 = MessageDigest.getInstance("SHA-1",
"wolfJCE");
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
/* if we also detect algo is compiled out, skip tests */ /* if we also detect algo is compiled out, skip tests */
if (FeatureDetect.ShaEnabled() == false) { if (FeatureDetect.ShaEnabled() == false) {