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

Merge pull request #283 from cconlon/fenrirSept18 

Fixes for JNI debug tracing, PKCS8 array release and WKS format docs
pull/289/head
Ruby Martin 2026-09-25 17:15:43 -05:00 committed by GitHub
parent 78644d20cf 6d821412c5
commit 71159d29a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 25 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/design/WolfSSLKeyStore.md
View File

@ -146,8 +146,8 @@ HMAC. If these are different, an IOException is thrown.
* creationDate.getTime() (long)
* key.getAlgorithm() (UTF String)
* kdfSalt.length (int)
* kdfIterations (int)
* kdfSalt (byte[])
* kdfIterations (int)
* iv.length (int)
* iv (byte[])
* encryptedKey.length (int)

14
jni/jni_aes.c
View File

@ -179,13 +179,6 @@ Java_com_wolfssl_wolfcrypt_Aes_native_1update_1internal__I_3BII_3BI(
LogStr("wc_AesCbcDecrypt(aes=%p, out, in, inSz) = %d\n", aes, ret);
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output, ret);
@ -258,13 +251,6 @@ Java_com_wolfssl_wolfcrypt_Aes_native_1update_1internal__ILjava_nio_ByteBuffer_2
else {
ret = length;
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
#else
throwNotCompiledInException(env);
ret = NOT_COMPILED_IN;

4
jni/jni_aescmac.c
View File

@ -218,7 +218,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_AesCmac_wc_1CmacUpdate___3BII(
throwWolfCryptExceptionFromError(env, ret);
LogStr("wc_CmacUpdate(cmac=%p, data, length) = %d\n", cmac, ret);
if (data != NULL) {
if (ret == 0) {
LogStr("data[%u]: [%p]\n", (word32)length, data + offset);
LogHex((byte*) data, offset, length);
}
@ -259,7 +259,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_AesCmac_wc_1CmacUpdate__Ljava_
throwWolfCryptExceptionFromError(env, ret);
LogStr("wc_CmacUpdate(cmac=%p, data, length) = %d\n", cmac, ret);
if (data != NULL) {
if (ret == 0) {
LogStr("data[%u]: [%p]\n", (word32)length, data + offset);
LogHex((byte*) data, offset, length);
}

14
jni/jni_aesctr.c
View File

@ -177,13 +177,6 @@ Java_com_wolfssl_wolfcrypt_AesCtr_native_1update_1internal___3BII_3BI(
LogStr("wc_AesCtrEncrypt(aes=%p, out, in, inSz) = %d\n", aes, ret);
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output, ret);
@ -250,13 +243,6 @@ Java_com_wolfssl_wolfcrypt_AesCtr_native_1update_1internal__Ljava_nio_ByteBuffer
else {
ret = length;
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
#else
throwNotCompiledInException(env);
#endif

14
jni/jni_aescts.c
View File

@ -48,7 +48,6 @@ typedef struct {
byte iv[AES_BLOCK_SIZE];
} AesCtsCtx;
#endif /* OPENSSL_EXTRA && !NO_AES && HAVE_CTS */
JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_AesCts_mallocNativeStruct_1internal
@ -212,9 +211,6 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_AesCts_native_1update_1interna
LogStr("update called: ctx=%p, opmode=%d, length=%d\n",
ctx, opmode, length);
LogStr("Input plaintext:\n");
LogHex((byte*)(input + offset), 0, length);
if (length == AES_BLOCK_SIZE) {
/* RFC 3962/8009: Special case for exactly one block.
* CTS reduces to plain CBC encryption - no stealing needed.
@ -244,9 +240,6 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_AesCts_native_1update_1interna
iv, (cbc128_f)AES_cbc_encrypt);
}
LogStr("Output ciphertext:\n");
LogHex((byte*)(output + outputOffset), 0, (outLen > 0) ? outLen : 0);
if (outLen == 0) {
/* CTS functions return 0 on error */
ret = BAD_FUNC_ARG;
@ -259,13 +252,6 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_AesCts_native_1update_1interna
ctx, opmode, length, ret);
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output,
(ret > 0) ? 0 : JNI_ABORT);

14
jni/jni_aesecb.c
View File

@ -179,13 +179,6 @@ Java_com_wolfssl_wolfcrypt_AesEcb_native_1update_1internal__I_3BII_3BI(
LogStr("wc_AesEcbDecrypt(aes=%p, out, in, inSz) = %d\n", aes, ret);
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output, ret);
@ -261,13 +254,6 @@ Java_com_wolfssl_wolfcrypt_AesEcb_native_1update_1internal__ILjava_nio_ByteBuffe
else {
ret = length;
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
#else
throwNotCompiledInException(env);
ret = NOT_COMPILED_IN;

15
jni/jni_aesofb.c
View File

@ -190,13 +190,6 @@ Java_com_wolfssl_wolfcrypt_AesOfb_native_1update_1internal__I_3BII_3BI(
#endif
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output, ret);
@ -215,7 +208,6 @@ Java_com_wolfssl_wolfcrypt_AesOfb_native_1update_1internal__I_3BII_3BI(
return ret;
}
JNIEXPORT jint JNICALL
Java_com_wolfssl_wolfcrypt_AesOfb_native_1update_1internal__ILjava_nio_ByteBuffer_2IILjava_nio_ByteBuffer_2I(
JNIEnv* env, jobject this, jint opmode,
@ -278,13 +270,6 @@ Java_com_wolfssl_wolfcrypt_AesOfb_native_1update_1internal__ILjava_nio_ByteBuffe
else {
ret = length;
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
#else
throwNotCompiledInException(env);
ret = NOT_COMPILED_IN;

7
jni/jni_asn.c
View File

@ -346,8 +346,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Asn_getPkcs8AlgoID
jboolean p8IsCopy = JNI_FALSE;
if (pkcs8Der != NULL) {
p8 = (byte*)(*env)->GetByteArrayElements(env, pkcs8Der, &p8IsCopy);
p8Len = (*env)->GetArrayLength(env, pkcs8Der);
p8 = (byte*)(*env)->GetByteArrayElements(env, pkcs8Der, &p8IsCopy);
if ((*env)->ExceptionOccurred(env)) {
return 0;
}
}
if (p8 == NULL || p8Len == 0) {
@ -383,7 +386,7 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Asn_getPkcs8AlgoID
XFREE(p8Copy, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
if (pkcs8Der != NULL) {
if (p8 != NULL) {
zeroizeByteArrayCopy(p8, p8Len, p8IsCopy);
(*env)->ReleaseByteArrayElements(env, pkcs8Der, (jbyte*)p8, JNI_ABORT);
}

14
jni/jni_des3.c
View File

@ -178,13 +178,6 @@ Java_com_wolfssl_wolfcrypt_Des3_native_1update_1internal__I_3BII_3BI(
LogStr("wc_Des3CbcDecrypt(des=%p, out, in, inSz) = %d\n", des, ret);
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
releaseByteArray(env, input_object, input, JNI_ABORT);
releaseByteArray(env, output_object, output, ret);
@ -256,13 +249,6 @@ Java_com_wolfssl_wolfcrypt_Des3_native_1update_1internal__ILjava_nio_ByteBuffer_
else {
ret = length;
}
if (input != NULL && output != NULL) {
LogStr("input[%u]: [%p]\n", (word32)length, input + offset);
LogHex((byte*) input, offset, length);
LogStr("output[%u]: [%p]\n", (word32)length, output + outputOffset);
LogHex((byte*) output, outputOffset, length);
}
#else
throwNotCompiledInException(env);
#endif

4
jni/jni_hmac.c
View File

@ -287,7 +287,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_Hmac_wc_1HmacUpdate___3BII
throwWolfCryptExceptionFromError(env, ret);
LogStr("wc_HmacUpdate(hmac=%p, data, length) = %d\n", hmac, ret);
if (data != NULL) {
if (ret == 0) {
LogStr("data[%u]: [%p]\n", (word32)length, data + offset);
LogHex((byte*) data, offset, length);
}
@ -328,7 +328,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_Hmac_wc_1HmacUpdate__Ljava_nio
throwWolfCryptExceptionFromError(env, ret);
LogStr("wc_HmacUpdate(hmac=%p, data, length) = %d\n", hmac, ret);
if (data != NULL) {
if (ret == 0) {
LogStr("data[%u]: [%p]\n", (word32)length, data + offset);
LogHex((byte*) data, offset, length);
}

5
jni/jni_rng.c
View File

@ -33,7 +33,6 @@
#include <wolfcrypt_jni_error.h>
#include <wolfcrypt_jni_NativeStruct.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>
@ -148,7 +147,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_Rng_rngGenerateBlock__Ljava_ni
}
LogStr("wc_RNG_GenerateBlock(rng=%p, buffer, size) = %d\n", rng, ret);
if (buffer != NULL) {
if (ret == 0) {
LogStr("output[%u]: [%p]\n", (word32)size, buffer + position);
LogHex(buffer, position, size);
}
@ -191,7 +190,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_Rng_rngGenerateBlock___3BII(
}
LogStr("wc_RNG_GenerateBlock(rng=%p, buffer, length) = %d\n", rng, ret);
if (buffer != NULL) {
if (ret == 0) {
LogStr("output[%u]: [%p]\n", (word32)length, buffer + offset);
LogHex(buffer, offset, length);
}

20
jni/jni_rsa.c
View File

@ -170,10 +170,12 @@ Java_com_wolfssl_wolfcrypt_Rsa_wc_1RsaPublicKeyDecodeRaw__Ljava_nio_ByteBuffer_2
}
LogStr("wc_RsaPublicKeyDecodeRaw(n, nSz, e, eSz) = %d\n", ret);
LogStr("n[%u]: [%p]\n", (word32)nSize, n);
LogHex((byte*) n, 0, nSize);
LogStr("e[%u]: [%p]\n", (word32)eSize, e);
LogHex((byte*) e, 0, eSize);
if (ret == 0) {
LogStr("n[%u]: [%p]\n", (word32)nSize, n);
LogHex((byte*) n, 0, nSize);
LogStr("e[%u]: [%p]\n", (word32)eSize, e);
LogHex((byte*) e, 0, eSize);
}
#else
throwNotCompiledInException(env);
#endif
@ -213,10 +215,12 @@ Java_com_wolfssl_wolfcrypt_Rsa_wc_1RsaPublicKeyDecodeRaw___3BJ_3BJ(
}
LogStr("wc_RsaPublicKeyDecodeRaw(n, nSz, e, eSz) = %d\n", ret);
LogStr("n[%u]: [%p]\n", (word32)nSize, n);
LogHex((byte*) n, 0, nSize);
LogStr("e[%u]: [%p]\n", (word32)eSize, e);
LogHex((byte*) e, 0, eSize);
if (ret == 0) {
LogStr("n[%u]: [%p]\n", (word32)nSize, n);
LogHex((byte*) n, 0, nSize);
LogStr("e[%u]: [%p]\n", (word32)eSize, e);
LogHex((byte*) e, 0, eSize);
}
releaseByteArray(env, n_object, n, JNI_ABORT);
releaseByteArray(env, e_object, e, JNI_ABORT);

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

@ -138,8 +138,8 @@ import com.wolfssl.wolfcrypt.WolfCryptException;
* creationDate.getTime() (long)
* key.getAlgorithm() (UTF String)
* kdfSalt.length (int)
* kdfIterations (int)
* kdfSalt (byte[])
* kdfIterations (int)
* iv.length (int)
* iv (byte[])
* encryptedKey.length (int)