Skip to content
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

Add SHA-224 support to MessageDigest, Mac, Signature, KeyGenerator #104

Merged
merged 5 commits into from
Mar 5, 2025
Merged

Add SHA-224 support to MessageDigest, Mac, Signature, KeyGenerator #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcbc411
JNI: add SHA-224 to com.wolfssl.wolfcrypt.Sha224 class
cconlon Feb 27, 2025
0149a37
JCE: add SHA-224 MessageDigest implementation
cconlon Mar 3, 2025
dcddf92
JCE: add HmacSHA224 support to Mac implementation
cconlon Mar 3, 2025
9e025b7
JCE: add SHA224withRSA and SHA224withECDSA to Signature implementation
cconlon Mar 3, 2025
aa49b15
JCE: add HmacSHA224 support to KeyGenerator implementation
cconlon Mar 3, 2025
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
5 changes: 5 additions & 0 deletions README_JCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ The JCE provider currently supports the following algorithms:
MessageDigest Class
MD5
SHA-1
SHA-224
SHA-256
SHA-384
SHA-512
Expand All @@ -107,17 +108,20 @@ The JCE provider currently supports the following algorithms:
Mac Class
HmacMD5
HmacSHA1
HmacSHA224
HmacSHA256
HmacSHA384
HmacSHA512

Signature Class
MD5withRSA
SHA1withRSA
SHA224withRSA
SHA256withRSA
SHA384withRSA
SHA512withRSA
SHA1withECDSA
SHA224withECDSA
SHA256withECDSA
SHA384withECDSA
SHA512withECDSA
Expand All @@ -130,6 +134,7 @@ The JCE provider currently supports the following algorithms:
KeyGenerator
AES
HmacSHA1
HmacSHA224
HmacSHA256
HmacSHA384
HmacSHA512
Expand Down
8 changes: 8 additions & 0 deletions jni/include/com_wolfssl_wolfcrypt_Hmac.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions jni/include/com_wolfssl_wolfcrypt_Sha224.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 25 additions & 8 deletions jni/jni_hmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
#ifndef NO_SHA
#define SHA_DIGEST_SIZE WC_SHA_DIGEST_SIZE
#endif
#ifdef WOLFSSL_SHA224
#define SHA224_DIGEST_SIZE WC_SHA224_DIGEST_SIZE
#endif
#ifndef NO_SHA256
#define SHA256_DIGEST_SIZE WC_SHA256_DIGEST_SIZE
#endif
Expand All @@ -61,44 +64,44 @@
/* copy from cyassl/hmac.c */
static WC_INLINE int GetHashSizeByType(int type)
{
if (!(type == WC_MD5 || type == WC_SHA || type == WC_SHA256
|| type == WC_SHA384 || type == WC_SHA512))
if (!(type == WC_MD5 || type == WC_SHA || type == WC_SHA224
|| type == WC_SHA256 || type == WC_SHA384 || type == WC_SHA512)) {
return BAD_FUNC_ARG;
}

switch (type) {
#ifndef NO_MD5
case WC_MD5:
return MD5_DIGEST_SIZE;
break;
#endif

#ifndef NO_SHA
case WC_SHA:
return SHA_DIGEST_SIZE;
break;
#endif

#ifdef WOLFSSL_SHA224
case WC_SHA224:
return SHA224_DIGEST_SIZE;
#endif

#ifndef NO_SHA256
case WC_SHA256:
return SHA256_DIGEST_SIZE;
break;
#endif

#if defined(CYASSL_SHA384) || defined(WOLFSSL_SHA384)
case WC_SHA384:
return SHA384_DIGEST_SIZE;
break;
#endif

#if defined(CYASSL_SHA512) || defined(WOLFSSL_SHA512)
case WC_SHA512:
return SHA512_DIGEST_SIZE;
break;
#endif

default:
return BAD_FUNC_ARG;
break;
}
}

Expand Down Expand Up @@ -355,6 +358,20 @@ Java_com_wolfssl_wolfcrypt_Hmac_getCodeSha(
#endif
}

JNIEXPORT jint JNICALL
Java_com_wolfssl_wolfcrypt_Hmac_getCodeSha224(
JNIEnv* env, jobject this)
{
#ifdef WOLFSSL_SHA224
jint result = WC_SHA224;
LogStr("WC_SHA224 = %d\n", result);
return result;
#else
/* not compiled in */
return (jint) -1;
#endif
}

JNIEXPORT jint JNICALL
Java_com_wolfssl_wolfcrypt_Hmac_getCodeSha256(
JNIEnv* env, jobject this)
Expand Down
Loading