From 4f1f3b56301ee67e6351f9b0e54de8768cec151d Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Thu, 8 Feb 2024 09:44:52 -0700 Subject: [PATCH] JCE: add "SHA1" alias for MessageDigest SHA-1, for interop with Sun --- .../java/com/wolfssl/provider/jce/WolfCryptProvider.java | 2 ++ .../provider/jce/test/WolfCryptMessageDigestShaTest.java | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java b/src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java index 360b4f9..b144c25 100644 --- a/src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java +++ b/src/main/java/com/wolfssl/provider/jce/WolfCryptProvider.java @@ -44,6 +44,8 @@ public final class WolfCryptProvider extends Provider { if (FeatureDetect.ShaEnabled()) { put("MessageDigest.SHA", "com.wolfssl.provider.jce.WolfCryptMessageDigestSha"); + put("MessageDigest.SHA1", + "com.wolfssl.provider.jce.WolfCryptMessageDigestSha"); put("MessageDigest.SHA-1", "com.wolfssl.provider.jce.WolfCryptMessageDigestSha"); } diff --git a/src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java b/src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java index 5807563..4f3490e 100644 --- a/src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java +++ b/src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java @@ -58,12 +58,15 @@ public class WolfCryptMessageDigestShaTest { assertNotNull(p); try { - /* Try "SHA" cipher string, for SUN interop */ + /* Try "SHA" and "SHA1" cipher strings, for SUN interop */ MessageDigest sha = MessageDigest.getInstance("SHA", "wolfJCE"); - MessageDigest sha1 = MessageDigest.getInstance("SHA-1", - "wolfJCE"); + MessageDigest sha1 = MessageDigest.getInstance("SHA1", + "wolfJCE"); + + MessageDigest shaDash1 = MessageDigest.getInstance("SHA-1", + "wolfJCE"); } catch (NoSuchAlgorithmException e) { /* if we also detect algo is compiled out, skip tests */ if (FeatureDetect.ShaEnabled() == false) {