Skip to content

Fix possible typecasting issues, typecast cleanup in native functions #98

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

Merged
JacobBarthelmeh merged 1 commit into from
Feb 15, 2022
Merged

Fix possible typecasting issues, typecast cleanup in native functions #98

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
17 changes: 10 additions & 7 deletions native/com_wolfssl_WolfSSL.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,14 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_init

/* used in unit tests */
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSL_nativeFree
(JNIEnv* jenv, jobject jcl, jlong ptr)
(JNIEnv* jenv, jobject jcl, jlong jptr)
{
void* ptr = (void*)(uintptr_t)jptr;
(void)jenv;
(void)jcl;

if((void*)(uintptr_t)ptr) {
XFREE((void*)(uintptr_t)ptr, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(ptr != NULL) {
XFREE(ptr, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
}

Expand Down Expand Up @@ -1063,19 +1064,21 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getPkcs8TraditionalOffset
}

JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSL_x509_1getDer
(JNIEnv* jenv, jclass jcl, jlong x509)
(JNIEnv* jenv, jclass jcl, jlong x509Ptr)
{
#if defined(KEEP_PEER_CERT) || defined(SESSION_CERTS)
int* outSz = NULL;
const unsigned char* derCert;
jbyteArray out = NULL;
WOLFSSL_X509* x509 = (WOLFSSL_X509*)(uintptr_t)x509Ptr;

(void)jcl;

if (!jenv || !x509)
if (jenv == NULL || x509 == NULL) {
return NULL;
}

derCert = wolfSSL_X509_get_der((WOLFSSL_X509*)(uintptr_t)x509, outSz);
derCert = wolfSSL_X509_get_der(x509, outSz);

if (*outSz >= 0) {

Expand All @@ -1093,7 +1096,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSL_x509_1getDer
#else
(void)jenv;
(void)jcl;
(void)x509;
(void)x509Ptr;
return NULL;
#endif
}
Expand Down
20 changes: 10 additions & 10 deletions native/com_wolfssl_WolfSSLCertManager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerFree
}

JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCA
(JNIEnv* jenv, jclass jcl, jlong cm, jstring f, jstring d)
(JNIEnv* jenv, jclass jcl, jlong cmPtr, jstring f, jstring d)
{
int ret;
const char* certFile = NULL;
const char* certPath = NULL;
WOLFSSL_CERT_MANAGER* cm = (WOLFSSL_CERT_MANAGER*)(uintptr_t)cmPtr;
(void)jcl;

if (jenv == NULL || cm == 0) {
if (jenv == NULL || cm == NULL) {
return (jint)BAD_FUNC_ARG;
}

certFile = (*jenv)->GetStringUTFChars(jenv, f, 0);
certPath = (*jenv)->GetStringUTFChars(jenv, d, 0);

ret = wolfSSL_CertManagerLoadCA((WOLFSSL_CERT_MANAGER*)(uintptr_t)cm,
certFile, certPath);
ret = wolfSSL_CertManagerLoadCA(cm, certFile, certPath);

(*jenv)->ReleaseStringUTFChars(jenv, f, certFile);
(*jenv)->ReleaseStringUTFChars(jenv, d, certPath);
Expand All @@ -72,11 +72,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCA
}

JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCABuffer
(JNIEnv* jenv, jclass jcl, jlong cm, jbyteArray in, jlong sz, jint format)
(JNIEnv* jenv, jclass jcl, jlong cmPtr, jbyteArray in, jlong sz, jint format)
{
int ret = 0;
word32 buffSz = 0;
byte* buff = NULL;
WOLFSSL_CERT_MANAGER* cm = (WOLFSSL_CERT_MANAGER*)(uintptr_t)cmPtr;
(void)jcl;

if (jenv == NULL || in == NULL || (sz < 0)) {
Expand All @@ -86,20 +87,20 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCABuff
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);

ret = wolfSSL_CertManagerLoadCABuffer((WOLFSSL_CERT_MANAGER*)(uintptr_t)cm,
buff, buffSz, format);
ret = wolfSSL_CertManagerLoadCABuffer(cm, buff, buffSz, format);

(*jenv)->ReleaseByteArrayElements(jenv, in, (jbyte*)buff, JNI_ABORT);

return (jint)ret;
}

JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerVerifyBuffer
(JNIEnv* jenv, jclass jcl, jlong cm, jbyteArray in, jlong sz, jint format)
(JNIEnv* jenv, jclass jcl, jlong cmPtr, jbyteArray in, jlong sz, jint format)
{
int ret = 0;
word32 buffSz = 0;
byte* buff = NULL;
WOLFSSL_CERT_MANAGER* cm = (WOLFSSL_CERT_MANAGER*)(uintptr_t)cmPtr;
(void)jcl;

if (jenv == NULL || in == NULL || (sz < 0))
Expand All @@ -108,8 +109,7 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerVerifyBuff
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);

ret = wolfSSL_CertManagerVerifyBuffer((WOLFSSL_CERT_MANAGER*)(uintptr_t)cm,
buff, buffSz, format);
ret = wolfSSL_CertManagerVerifyBuffer(cm, buff, buffSz, format);

(*jenv)->ReleaseByteArrayElements(jenv, in, (jbyte*)buff, JNI_ABORT);

Expand Down
Loading