Skip to content

JCE: streaming AES-GCM encrypt #290

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

Open
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JCE: streaming AES-GCM encrypt #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions jni/include/com_wolfssl_wolfcrypt_AesGcm.h
View file
Open in desktop

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

240 changes: 240 additions & 0 deletions jni/jni_aesgcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,3 +764,243 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_wolfcrypt_AesGcm_wc_1AesGcmEncrypt
return NULL;
#endif
}

/*
* Initialize AES-GCM streaming encryption.
* Key must already be loaded via wc_AesGcmSetKey. This call sets the IV
* and prepares internal streaming state (WOLFSSL_AESGCM_STREAM).
*/
JNIEXPORT void JNICALL
Java_com_wolfssl_wolfcrypt_AesGcm_wc_1AesGcmEncryptInitStreaming(
JNIEnv* env, jobject this, jbyteArray ivArr)
{
#if !defined(NO_AES) && defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM)
int ret = 0;
Aes* aes = NULL;
const byte* iv = NULL;
word32 ivSz = 0;

aes = (Aes*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
return;
}

if (ivArr != NULL) {
ivSz = (*env)->GetArrayLength(env, ivArr);
iv = (const byte*)(*env)->GetByteArrayElements(env, ivArr, NULL);
if ((*env)->ExceptionOccurred(env)) {
ret = MEMORY_E;
}
}

if ((ret == 0) && (iv == NULL || ivSz == 0)) {
ret = BAD_FUNC_ARG;
}

/*
* Pass NULL key (key already loaded via wc_AesGcmSetKey).
* wc_AesGcmEncryptInit only sets key when key != NULL.
*/
if (ret == 0) {
ret = wc_AesGcmEncryptInit(aes, NULL, 0, iv, ivSz);
}

if (iv != NULL) {
(*env)->ReleaseByteArrayElements(env, ivArr, (jbyte*)iv, JNI_ABORT);
}

if (ret != 0) {
throwWolfCryptExceptionFromError(env, ret);
}

LogStr("wc_AesGcmEncryptInit(aes = %p, ivSz = %d)\n", aes, ivSz);
#else
(void)this;
(void)ivArr;
throwNotCompiledInException(env);
#endif
}

/*
* Streaming AES-GCM encrypt update: encrypt plaintext and/or process AAD.
* inputArr may be NULL or empty (AAD-only call).
* authInArr may be NULL (no AAD for this call).
* Returns a jbyteArray of length inputArr.length containing ciphertext.
*/
JNIEXPORT jbyteArray JNICALL
Java_com_wolfssl_wolfcrypt_AesGcm_wc_1AesGcmEncryptUpdateStreaming(
JNIEnv* env, jobject this, jbyteArray inputArr,
jbyteArray authInArr)
{
#if !defined(NO_AES) && defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM)
int ret = 0;
Aes* aes = NULL;
const byte* in = NULL;
const byte* authIn = NULL;
word32 inLen = 0;
word32 authInSz = 0;
jboolean inIsCopy = JNI_FALSE;
byte* out = NULL;
jbyteArray outArr = NULL;

aes = (Aes*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
return NULL;
}

if (inputArr != NULL) {
inLen = (*env)->GetArrayLength(env, inputArr);
in = (const byte*)(*env)->GetByteArrayElements(env, inputArr,
&inIsCopy);
if ((*env)->ExceptionOccurred(env)) {
ret = MEMORY_E;
}
if ((ret == 0) && (inLen > 0) && (in == NULL)) {
ret = BAD_FUNC_ARG;
}
}
if ((ret == 0) && (authInArr != NULL)) {
authInSz = (*env)->GetArrayLength(env, authInArr);
authIn = (const byte*)(*env)->GetByteArrayElements(env,
authInArr, NULL);
if ((*env)->ExceptionOccurred(env)) {
ret = MEMORY_E;
}
if ((ret == 0) && (authInSz > 0) && (authIn == NULL)) {
ret = BAD_FUNC_ARG;
}
}

if ((ret == 0) && (inLen > 0)) {
out = (byte*)XMALLOC(inLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (out == NULL) {
ret = MEMORY_E;
}
else {
XMEMSET(out, 0, inLen);
}
}

if (ret == 0) {
ret = wc_AesGcmEncryptUpdate(aes, out, in, inLen, authIn, authInSz);
}

if (ret == 0) {
outArr = (*env)->NewByteArray(env, (jsize)inLen);
if (outArr == NULL) {
ret = MEMORY_E;
}
else if (inLen > 0) {
(*env)->SetByteArrayRegion(env, outArr, 0, (jsize)inLen,
(jbyte*)out);
if ((*env)->ExceptionOccurred(env)) {
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
(*env)->DeleteLocalRef(env, outArr);
outArr = NULL;
ret = -1;
}
}
}

/* Wipe any plaintext copy before release */
if (in != NULL) {
zeroizeByteArrayCopy((byte*)in, inLen, inIsCopy);
(*env)->ReleaseByteArrayElements(env, inputArr, (jbyte*)in, JNI_ABORT);
}
Comment on lines +907 to +910

@MarkAtwood MarkAtwood Oct 7, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in ca1bb48, acquire with isCopy and zeroizeByteArrayCopy before the JNI_ABORT release, same as the existing encrypt path

if (authIn != NULL) {
(*env)->ReleaseByteArrayElements(env, authInArr, (jbyte*)authIn,
JNI_ABORT);
}
if (out != NULL) {
XFREE(out, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}

LogStr("wc_AesGcmEncryptUpdate(aes = %p, inLen = %d, authInSz = %d)\n",
aes, inLen, authInSz);

if (ret != 0) {
throwWolfCryptExceptionFromError(env, ret);
return NULL;
}

return outArr;

#else
(void)this;
(void)inputArr;
(void)authInArr;
throwNotCompiledInException(env);
return NULL;
#endif
}

/*
* Finalize AES-GCM streaming encryption and generate authentication tag.
* Returns a jbyteArray of length tagLen containing the authentication tag.
*/
JNIEXPORT jbyteArray JNICALL
Java_com_wolfssl_wolfcrypt_AesGcm_wc_1AesGcmEncryptFinalStreaming(
JNIEnv* env, jobject this, jint tagLen)
{
#if !defined(NO_AES) && defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM)
int ret = 0;
Aes* aes = NULL;
byte* tag = NULL;
jbyteArray tagArr = NULL;

aes = (Aes*) getNativeStruct(env, this);
if ((*env)->ExceptionOccurred(env)) {
return NULL;
}

if (tagLen <= 0 || tagLen > AES_BLOCK_SIZE) {
throwWolfCryptExceptionFromError(env, BAD_FUNC_ARG);
return NULL;
}

tag = (byte*)XMALLOC((word32)tagLen, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (tag == NULL) {
throwWolfCryptExceptionFromError(env, MEMORY_E);
return NULL;
}
XMEMSET(tag, 0, (word32)tagLen);

ret = wc_AesGcmEncryptFinal(aes, tag, (word32)tagLen);

if (ret == 0) {
tagArr = (*env)->NewByteArray(env, tagLen);
if (tagArr == NULL) {
ret = MEMORY_E;
}
else {
(*env)->SetByteArrayRegion(env, tagArr, 0, tagLen, (jbyte*)tag);
if ((*env)->ExceptionOccurred(env)) {
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
(*env)->DeleteLocalRef(env, tagArr);
tagArr = NULL;
ret = -1;
}
}
}

XFREE(tag, NULL, DYNAMIC_TYPE_TMP_BUFFER);

LogStr("wc_AesGcmEncryptFinal(aes = %p, tagLen = %d)\n", aes, tagLen);

if (ret != 0) {
throwWolfCryptExceptionFromError(env, ret);
return NULL;
}

return tagArr;

#else
(void)this;
(void)tagLen;
throwNotCompiledInException(env);
return NULL;
#endif
}

Loading
Loading