clean up unused parameter warnings

pull/23/head
Chris Conlon 2019-08-29 10:48:07 -07:00
parent fe70738288
commit 9fd4dc1a95
6 changed files with 605 additions and 5 deletions

View File

@ -42,6 +42,8 @@ void NativeLoggingCallback(const int logLevel, const char *const logMessage);
/* called when native library is loaded */
jint JNI_OnLoad(JavaVM* vm, void* reserved)
{
(void)reserved;
/* store JavaVM */
g_vm = vm;
return JNI_VERSION_1_6;
@ -50,6 +52,9 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_init
(JNIEnv* jenv, jobject jcl)
{
(void)jenv;
(void)jcl;
return (jint)wolfSSL_Init();
}
@ -57,6 +62,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_init
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSL_nativeFree
(JNIEnv* jenv, jobject jcl, jlong ptr)
{
(void)jenv;
(void)jcl;
if((void*)(intptr_t)ptr)
free((void*)(intptr_t)ptr);
}
@ -65,42 +73,63 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSL_nativeFree
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumNULL
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_cipher_null;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumRC4
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_rc4;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumRC2
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_rc2;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumDES
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_des;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnum3DES
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_triple_des;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumDES40
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_des40;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumIDEA
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_IDEA
return wolfssl_idea;
#else
@ -111,48 +140,72 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumIDEA
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumAES
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_aes;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumAESGCM
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_aes_gcm;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumAESCCM
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_aes_ccm;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumCHACHA
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_chacha;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumCAMELLIA
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_camellia;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumHC128
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_hc128;
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumRABBIT
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfssl_rabbit;
}
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv1Enabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS) && defined(WOLFSSL_ALLOW_TLSV10)
return JNI_TRUE;
#else
@ -163,6 +216,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv1Enabled
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv11Enabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS)
return JNI_TRUE;
#else
@ -173,6 +229,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv11Enabled
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv12Enabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS)
return JNI_TRUE;
#else
@ -183,6 +242,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv12Enabled
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv13Enabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_TLS13
return JNI_TRUE;
#else
@ -193,6 +255,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_TLSv13Enabled
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_EccEnabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_ECC
return JNI_TRUE;
#else
@ -203,6 +268,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_EccEnabled
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_RsaEnabled
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifndef NO_RSA
return JNI_TRUE;
#else
@ -213,6 +281,9 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSL_RsaEnabled
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv3_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if defined(WOLFSSL_ALLOW_SSLV3) && !defined(NO_OLD_TLS)
return (jlong)(intptr_t)wolfSSLv3_server_method();
#else
@ -223,6 +294,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv3_1ServerMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv3_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if defined(WOLFSSL_ALLOW_SSLV3) && !defined(NO_OLD_TLS)
return (jlong)(intptr_t)wolfSSLv3_client_method();
#else
@ -233,6 +307,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv3_1ClientMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS) && defined(WOLFSSL_ALLOW_TLSV10)
return (jlong)(intptr_t)wolfTLSv1_method();
#else
@ -243,6 +320,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1Method
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS) && defined(WOLFSSL_ALLOW_TLSV10)
return (jlong)(intptr_t)wolfTLSv1_server_method();
#else
@ -253,6 +333,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1ServerMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#if !defined(NO_OLD_TLS) && defined(WOLFSSL_ALLOW_TLSV10)
return (jlong)(intptr_t)wolfTLSv1_client_method();
#else
@ -263,42 +346,63 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_1ClientMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_11_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_1_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_11_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_1_server_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_11_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_1_client_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_12_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_2_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_12_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_2_server_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_12_1ClientMethod(
JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfTLSv1_2_client_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_13_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_TLS13
return (jlong)(intptr_t)wolfTLSv1_3_method();
#else
@ -309,6 +413,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_TLSv1_13_1Method
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_method();
#else
@ -319,6 +426,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1Method
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_client_method();
#else
@ -329,6 +439,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1ClientMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_server_method();
#else
@ -339,6 +452,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_1ServerMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_2_method();
#else
@ -349,6 +465,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1Method
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_2_client_method();
#else
@ -359,6 +478,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1ClientMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return (jlong)(intptr_t)wolfDTLSv1_2_server_method();
#else
@ -369,19 +491,28 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_DTLSv1_12_1ServerMethod
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv23_1Method
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfSSLv23_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv23_1ServerMethod
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfSSLv23_server_method();
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSL_SSLv23_1ClientMethod
(JNIEnv* jenv, jclass jcl)
{
return (jlong)wolfSSLv23_client_method();
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfSSLv23_client_method();
}
JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getErrorString
@ -390,6 +521,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getErrorString
char buffer[WOLFSSL_MAX_ERROR_SZ];
jstring retString;
(void)jcl;
wolfSSL_ERR_error_string(errNumber, buffer);
retString = (*jenv)->NewStringUTF(jenv, buffer);
@ -399,18 +532,27 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getErrorString
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_cleanup
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfSSL_Cleanup();
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_debuggingON
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfSSL_Debugging_ON();
}
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSL_debuggingOFF
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return wolfSSL_Debugging_OFF();
}
@ -419,6 +561,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_setLoggingCb
{
int ret = 0;
(void)jcl;
if (!jenv || !callback) {
return BAD_FUNC_ARG;
}
@ -530,6 +674,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_memsaveSessionCache
int cacheSz;
char memBuf[sz];
(void)jcl;
if (!jenv || !mem || (sz <= 0))
return BAD_FUNC_ARG;
@ -550,6 +696,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_memsaveSessionCache
return ret;
#else
(void)jenv;
(void)jcl;
(void)mem;
(void)sz;
return NOT_COMPILED_IN;
#endif
}
@ -561,6 +711,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_memrestoreSessionCache
int ret;
char memBuf[sz];
(void)jcl;
if (!jenv || !mem || (sz <= 0))
return BAD_FUNC_ARG;
@ -574,6 +726,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_memrestoreSessionCache
ret = wolfSSL_memrestore_session_cache(memBuf, sz);
return ret;
#else
(void)jenv;
(void)jcl;
(void)mem;
(void)sz;
return NOT_COMPILED_IN;
#endif
}
@ -581,6 +737,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_memrestoreSessionCache
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getSessionCacheMemsize
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef PERSIST_SESSION_CACHE
return wolfSSL_get_session_cache_memsize();
#else
@ -595,6 +753,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getPkcs8TraditionalOffset
word32 inOutIdx;
unsigned char inBuf[sz];
(void)jcl;
if (!jenv || !in || (sz <= 0))
return BAD_FUNC_ARG;
@ -622,6 +782,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSL_x509_1getDer
const unsigned char* derCert;
jbyteArray out = NULL;
(void)jcl;
if (!jenv || !x509)
return NULL;
@ -641,6 +803,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSL_x509_1getDer
return NULL;
}
#else
(void)jenv;
(void)jcl;
(void)x509;
return NULL;
#endif
}
@ -648,6 +813,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSL_x509_1getDer
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getHmacMaxSize
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return WC_MAX_DIGEST_SIZE;
}
@ -658,6 +826,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getEnabledCipherSuites
char ciphers[4096];
jstring retString;
(void)jcl;
ret = wolfSSL_get_ciphers(ciphers, sizeof(ciphers));
if (ret != WOLFSSL_SUCCESS) {
return NULL;
@ -675,6 +845,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getEnabledCipherSuitesIana
char ciphers[4096];
jstring retString;
(void)jcl;
ret = wolfSSL_get_ciphers_iana(ciphers, sizeof(ciphers));
if (ret != WOLFSSL_SUCCESS) {
return NULL;
@ -688,6 +860,9 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSL_getEnabledCipherSuitesIana
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledCRL
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_CRL
return 1;
#else
@ -698,6 +873,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledCRL
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledCRLMonitor
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_CRL_MONITOR
return 1;
#else
@ -708,6 +886,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledCRLMonitor
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledOCSP
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_OCSP
return 1;
#else
@ -718,6 +899,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledOCSP
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledPSK
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifndef NO_PSK
return 1;
#else
@ -728,6 +912,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledPSK
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledDTLS
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef WOLFSSL_DTLS
return 1;
#else
@ -738,6 +925,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledDTLS
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledAtomicUser
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
return 1;
#else
@ -748,6 +938,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledAtomicUser
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_isEnabledPKCallbacks
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_PK_CALLBACKS
return 1;
#else
@ -761,6 +954,8 @@ JNIEXPORT jobjectArray JNICALL Java_com_wolfssl_WolfSSL_getProtocols
jobjectArray ret;
int numProtocols = 0, idx = 0;
(void)jcl;
/* get the number of protocols enabled */
#ifdef WOLFSSL_TLS13
numProtocols += 1;

View File

@ -30,12 +30,18 @@
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerNew
(JNIEnv* jenv, jclass jcl)
{
(void)jenv;
(void)jcl;
return (jlong)(intptr_t)wolfSSL_CertManagerNew();
}
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerFree
(JNIEnv* jenv, jclass jcl, jlong cm)
{
(void)jenv;
(void)jcl;
wolfSSL_CertManagerFree((WOLFSSL_CERT_MANAGER*)(intptr_t)cm);
}
@ -45,6 +51,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCA
const char* certFile;
const char* certPath;
(void)jcl;
certFile = (*jenv)->GetStringUTFChars(jenv, f, 0);
certPath = (*jenv)->GetStringUTFChars(jenv, d, 0);
return (jint)wolfSSL_CertManagerLoadCA((WOLFSSL_CERT_MANAGER*)(intptr_t)cm,
@ -56,6 +64,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerLoadCABuff
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -87,6 +97,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertManager_CertManagerVerifyBuff
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !in || (sz < 0))
return BAD_FUNC_ARG;

View File

@ -36,6 +36,8 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLCertificate_d2i_1X509
unsigned char buff[sz];
const unsigned char* pt = buff;
(void)jcl;
if (!jenv || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -142,6 +144,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1tbs
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1free
(JNIEnv* jenv, jclass jcl, jlong x509)
{
(void)jenv;
(void)jcl;
wolfSSL_X509_free((WOLFSSL_X509*)(intptr_t)x509);
}
@ -152,6 +157,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1serial_1nu
unsigned char s[MAX_SERIAL_SIZE];
int sz = MAX_SERIAL_SIZE;
(void)jcl;
if (wolfSSL_X509_get_serial_number((WOLFSSL_X509*)(intptr_t)x509, s, &sz) ==
WOLFSSL_SUCCESS) {
@ -184,6 +191,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1notBefore
const byte* date = NULL;
char ret[32];
(void)jcl;
date = wolfSSL_X509_notBefore((WOLFSSL_X509*)(intptr_t)x509);
/* returns string holding date i.e. "Thu Jan 07 08:23:09 MST 2021" */
@ -201,6 +210,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1notAfter
const byte* date = NULL;
char ret[32];
(void)jcl;
date = wolfSSL_X509_notAfter((WOLFSSL_X509*)(intptr_t)x509);
/* returns string holding date i.e. "Thu Jan 07 08:23:09 MST 2021" */
@ -215,6 +226,9 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1notAfter
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1version
(JNIEnv* jenv, jclass jcl, jlong x509)
{
(void)jenv;
(void)jcl;
return (jint)wolfSSL_X509_version((WOLFSSL_X509*)(intptr_t)x509);
}
@ -308,6 +322,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1signatu
int oidSz = sizeof(oid);
int nid;
(void)jcl;
nid = wolfSSL_X509_get_signature_nid((WOLFSSL_X509*)(intptr_t)x509);
obj = wolfSSL_OBJ_nid2obj(nid);
if (obj == NULL) {
@ -329,6 +345,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1print
jstring ret = NULL;
const char* mem = NULL;
(void)jcl;
bio = wolfSSL_BIO_new(wolfSSL_BIO_s_mem());
if (bio == NULL) {
return NULL;
@ -351,6 +369,9 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1print
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1isCA
(JNIEnv* jenv, jclass jcl, jlong x509)
{
(void)jenv;
(void)jcl;
return (jint)wolfSSL_X509_get_isCA((WOLFSSL_X509*)(intptr_t)x509);
}
@ -360,6 +381,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1subject
{
WOLFSSL_X509_NAME* name = NULL;
(void)jcl;
name = wolfSSL_X509_get_subject_name((WOLFSSL_X509*)(intptr_t)x509);
if (name != NULL) {
jstring ret = NULL;
@ -379,6 +402,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1issuer_
{
WOLFSSL_X509_NAME* name = NULL;
(void)jcl;
name = wolfSSL_X509_get_issuer_name((WOLFSSL_X509*)(intptr_t)x509);
if (name != NULL) {
jstring ret = NULL;
@ -458,6 +483,9 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1pubkey_
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1get_1pathLength
(JNIEnv* jenv, jclass jcl, jlong x509)
{
(void)jenv;
(void)jcl;
if (wolfSSL_X509_get_isSet_pathLength((WOLFSSL_X509*)(intptr_t)x509)) {
return (jint)wolfSSL_X509_get_pathLength((WOLFSSL_X509*)(intptr_t)x509);
}
@ -475,6 +503,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1verify
unsigned char buff[sz];
unsigned char* ptr = buff;
(void)jcl;
if (!jenv || !pubKey || (sz < 0))
return BAD_FUNC_ARG;
@ -628,6 +658,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLCertificate_X509_1is_1extension_1
int nid;
const char* oid;
(void)jcl;
oid = (*jenv)->GetStringUTFChars(jenv, oidIn, 0);
nid = wolfSSL_OBJ_txt2nid(oid);
if (nid == NID_undef) {

View File

@ -149,6 +149,10 @@ static void throwWolfSSLJNIExceptionWithMsg(JNIEnv* jenv, const char* msg,
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLContext_newContext(JNIEnv* jenv,
jclass jcl, jlong method)
{
(void)jenv;
(void)jcl;
/* wolfSSL checks for NULL method ptr */
return (jlong)(intptr_t)wolfSSL_CTX_new((WOLFSSL_METHOD*)(intptr_t)method);
}
@ -160,6 +164,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateFile
jclass excClass;
const char* certFile;
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -194,6 +200,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_usePrivateKeyFile
jclass excClass;
const char* keyFile;
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -229,6 +237,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_loadVerifyLocations
const char* caFile;
const char* caPath;
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -276,6 +286,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainFile
jclass excClass;
const char* chainFile;
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -307,6 +319,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainFile
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_freeContext
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jenv;
(void)jcl;
/* wolfSSL checks for null pointer */
wolfSSL_CTX_free((WOLFSSL_CTX*)(intptr_t)ctx);
}
@ -314,6 +329,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_freeContext
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setVerify(JNIEnv* jenv,
jobject jcl, jlong ctx, jint mode, jobject callbackIface)
{
(void)jcl;
if (!callbackIface) {
wolfSSL_CTX_set_verify((WOLFSSL_CTX*)(intptr_t)ctx, mode, NULL);
} else {
@ -430,6 +447,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_memsaveCertCache
int usedTmp;
char memBuf[sz];
(void)jcl;
if (!jenv || !ctx || !mem || (sz <= 0))
return BAD_FUNC_ARG;
@ -470,6 +489,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_memsaveCertCache
return ret;
#else
(void)jenv;
(void)jcl;
(void)ctx;
(void)mem;
(void)sz;
(void)used;
return NOT_COMPILED_IN;
#endif
}
@ -481,6 +506,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_memrestoreCertCache
int ret;
char memBuf[sz];
(void)jcl;
if (!jenv || !ctx || !mem || (sz <= 0))
return BAD_FUNC_ARG;
@ -508,6 +535,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_memrestoreCertCache
return ret;
#else
(void)jenv;
(void)jcl;
(void)ctx;
(void)mem;
(void)sz;
return NOT_COMPILED_IN;
#endif
}
@ -515,6 +547,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_memrestoreCertCache
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_getCertCacheMemsize
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jenv;
(void)jcl;
#ifdef PERSIST_CERT_CACHE
/* wolfSSL checks for null pointer */
return wolfSSL_CTX_get_cert_cache_memsize((WOLFSSL_CTX*)(intptr_t)ctx);
@ -526,6 +560,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_getCertCacheMemsize
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLContext_setCacheSize
(JNIEnv* jenv, jobject jcl, jlong ctx, jlong sz)
{
(void)jenv;
(void)jcl;
return wolfSSL_CTX_sess_set_cache_size((WOLFSSL_CTX*)(intptr_t)ctx, sz);
}
@ -533,6 +570,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLContext_setCacheSize
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLContext_getCacheSize
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jenv;
(void)jcl;
return wolfSSL_CTX_sess_get_cache_size((WOLFSSL_CTX*)(intptr_t)ctx);
}
@ -543,6 +583,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setCipherList
jclass excClass;
const char* cipherList;
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -576,6 +618,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_loadVerifyBuffer
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !ctx || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -607,6 +651,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateBuffer
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !ctx || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -638,6 +684,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_usePrivateKeyBuffer
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !ctx || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -669,6 +717,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainBuffer
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !ctx || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -701,6 +751,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainBuffer
{
unsigned char buff[sz];
(void)jcl;
if (!jenv || !ctx || !in || (sz < 0))
return BAD_FUNC_ARG;
@ -731,7 +783,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainBuffer
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setGroupMessages
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
if (!jenv || !ctx)
(void)jenv;
(void)jcl;
if (!ctx)
return BAD_FUNC_ARG;
return wolfSSL_CTX_set_group_messages((WOLFSSL_CTX*)(intptr_t)ctx);
@ -740,6 +795,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setGroupMessages
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setIORecv(JNIEnv* jenv,
jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -958,6 +1015,8 @@ int NativeIORecvCb(WOLFSSL *ssl, char *buf, int sz, void *ctx)
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setIOSend
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class in case we need it */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -1174,6 +1233,8 @@ int NativeIOSendCb(WOLFSSL *ssl, char *buf, int sz, void *ctx)
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setGenCookie
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class in case we need it */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -1218,6 +1279,8 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
jmethodID cookieCbMethodId; /* internalGenCookieCallback ID */
jbyteArray inData; /* jbyteArray to hold cookie data */
(void)ctx;
if (!g_vm || !ssl || !buf) {
/* can't throw exception yet, just return error */
return GEN_COOKIE_E;
@ -1404,8 +1467,10 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_enableCRL
(JNIEnv* jenv, jobject jcl, jlong ctx, jint options)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_CRL
if (!jenv || !ctx)
if (!ctx)
return BAD_FUNC_ARG;
return wolfSSL_CTX_EnableCRL((WOLFSSL_CTX*)(intptr_t)ctx, options);
@ -1417,8 +1482,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_enableCRL
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_disableCRL
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_CRL
if (!jenv || !ctx)
if (!ctx)
return BAD_FUNC_ARG;
return wolfSSL_CTX_DisableCRL((WOLFSSL_CTX*)(intptr_t)ctx);
@ -1434,6 +1501,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_loadCRL
int ret;
const char* crlPath;
(void)jcl;
if (!jenv || !ctx || !path)
return BAD_FUNC_ARG;
@ -1446,6 +1515,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_loadCRL
return ret;
#else
(void)jenv;
(void)jcl;
(void)ctx;
(void)path;
(void)type;
(void)monitor;
return NOT_COMPILED_IN;
#endif
}
@ -1457,6 +1532,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setCRLCb
int ret = 0;
jclass excClass;
(void)jcl;
if (!jenv || !ctx || !cb) {
return BAD_FUNC_ARG;
}
@ -1479,6 +1556,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setCRLCb
return ret;
#else
(void)jenv;
(void)jcl;
(void)ctx;
(void)cb
return NOT_COMPILED_IN;
#endif
}
@ -1570,6 +1651,8 @@ void NativeCtxMissingCRLCallback(const char* url)
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_enableOCSP
(JNIEnv* jenv, jobject jcl, jlong ctx, jlong options)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_OCSP
/* wolfSSL checks for null pointer */
return wolfSSL_CTX_EnableOCSP((WOLFSSL_CTX*)(intptr_t)ctx, options);
@ -1581,6 +1664,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_enableOCSP
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_disableOCSP
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jenv;
(void)jcl;
#ifdef HAVE_OCSP
/* wolfSSL checks for null pointer */
return wolfSSL_CTX_DisableOCSP((WOLFSSL_CTX*)(intptr_t)ctx);
@ -1597,6 +1682,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setOCSPOverrideUrl
jclass excClass;
const char* url;
(void)jcl;
/* wolfSSL checks ctx for NULL */
if (!jenv)
return BAD_FUNC_ARG;
@ -1625,6 +1712,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setOCSPOverrideUrl
return ret;
#else
(void)jenv;
(void)jcl;
(void)ctx;
(void)urlString;
return NOT_COMPILED_IN;
#endif
}
@ -1632,6 +1723,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_setOCSPOverrideUrl
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setMacEncryptCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -1661,6 +1754,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setMacEncryptCb
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setDecryptVerifyCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -1713,6 +1808,8 @@ int NativeMacEncryptCb(WOLFSSL* ssl, unsigned char* macOut,
int hmacSize;
jbyteArray j_macIn;
(void)ctx;
if (!g_vm || !ssl || !macOut || !macIn || !encOut || !encIn) {
return -1;
}
@ -1973,6 +2070,8 @@ int NativeDecryptVerifyCb(WOLFSSL* ssl, unsigned char* decOut,
jbyteArray j_decIn;
jlongArray j_padSz;
(void)ctx;
if (!g_vm || !ssl || !decOut || !decIn || !padSz) {
return -1;
}
@ -2208,6 +2307,8 @@ int NativeDecryptVerifyCb(WOLFSSL* ssl, unsigned char* decOut,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setEccSignCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -2258,6 +2359,8 @@ int NativeEccSignCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
jlongArray j_outSz;
(void)ctx;
if (!g_vm || !ssl || !in || !out || !outSz || !keyDer)
return -1;
@ -2504,6 +2607,8 @@ int NativeEccSignCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setEccVerifyCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -2555,6 +2660,8 @@ int NativeEccVerifyCb(WOLFSSL* ssl, const unsigned char* sig,
jmethodID eccVerifyMethodId;
jintArray j_result;
(void)ctx;
if (!g_vm || !ssl || !sig || !hash || !keyDer || !result)
return -1;
@ -2789,6 +2896,7 @@ int NativeEccVerifyCb(WOLFSSL* ssl, const unsigned char* sig,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setEccSharedSecretCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
#if defined(HAVE_PK_CALLBACKS) && defined(HAVE_ECC)
if(ctx) {
/* set ECC shared secret callback */
@ -2801,6 +2909,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setEccSharedSecretCb
"EccSharedSecretCb", 0);
}
#else
(void)ctx;
throwWolfSSLJNIExceptionWithMsg(jenv,
"wolfSSL not compiled with PK Callback support "
"(HAVE_PK_CALLBACKS)", 0);
@ -2957,6 +3066,8 @@ int NativeEccSharedSecretCb(WOLFSSL* ssl, ecc_key* otherKey,
jobject pubKeyDerBB;
(void)ctx;
if (!g_vm || !ssl || !otherKey || !publicKeyDer || !pubKeySz ||
!out || !outlen)
return -1;
@ -3230,6 +3341,8 @@ int NativeEccSharedSecretCb(WOLFSSL* ssl, ecc_key* otherKey,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setRsaSignCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -3278,6 +3391,8 @@ int NativeRsaSignCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
jmethodID rsaSignMethodId;
jintArray j_outSz;
(void)ctx;
if (!g_vm || !ssl || !in || !out || !outSz || !keyDer)
return -1;
@ -3530,6 +3645,8 @@ int NativeRsaSignCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setRsaVerifyCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -3578,6 +3695,8 @@ int NativeRsaVerifyCb(WOLFSSL* ssl, unsigned char* sig, unsigned int sigSz,
jclass innerCtxClass; /* WolfSSLContext class */
jmethodID rsaVerifyMethodId;
(void)ctx;
if (!g_vm || !ssl || !sig || !out || !keyDer)
return -1;
@ -3776,6 +3895,8 @@ int NativeRsaVerifyCb(WOLFSSL* ssl, unsigned char* sig, unsigned int sigSz,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setRsaEncCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -3824,6 +3945,8 @@ int NativeRsaEncCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
jmethodID rsaEncMethodId;
jintArray j_outSz;
(void)ctx;
if (!g_vm || !ssl || !in || !out || !outSz || !keyDer)
return -1;
@ -4069,6 +4192,8 @@ int NativeRsaEncCb(WOLFSSL* ssl, const unsigned char* in, unsigned int inSz,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setRsaDecCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -4116,6 +4241,8 @@ int NativeRsaDecCb(WOLFSSL* ssl, unsigned char* in, unsigned int inSz,
jclass innerCtxClass; /* WolfSSLContext class */
jmethodID rsaDecMethodId;
(void)ctx;
if (!g_vm || !ssl || !in || !out || !keyDer)
return -1;
@ -4320,6 +4447,8 @@ int NativeRsaDecCb(WOLFSSL* ssl, unsigned char* in, unsigned int inSz,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setPskClientCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -4746,6 +4875,8 @@ unsigned int NativePskClientCb(WOLFSSL* ssl, const char* hint, char* identity,
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setPskServerCb
(JNIEnv* jenv, jobject jcl, jlong ctx)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -5059,6 +5190,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_usePskIdentityHint
jint ret;
const char* nativeHint;
(void)obj;
if (!jenv || !ctx || !hint)
return SSL_FAILURE;
@ -5071,6 +5204,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_usePskIdentityHint
return ret;
#else
(void)jenv;
(void)obj;
(void)ctx;
(void)hint;
return NOT_COMPILED_IN;
#endif
}

View File

@ -183,6 +183,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setFd(JNIEnv* jenv,
jobject impl;
jobject fdesc;
(void)jcl;
if (!jenv || !ssl || !jsock)
return SSL_FAILURE;
@ -254,6 +256,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateFile
jint ret = 0;
const char* certFile;
(void)jcl;
if (!jenv || !ssl)
return SSL_FAILURE;
@ -269,6 +273,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateFile
return ret;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)file;
(void)format;
return NOT_COMPILED_IN;
#endif
}
@ -280,6 +289,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePrivateKeyFile
jint ret = 0;
const char* keyFile;
(void)jcl;
if (!jenv || !ssl)
return SSL_FAILURE;
@ -295,6 +306,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePrivateKeyFile
return ret;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)file;
(void)format;
return NOT_COMPILED_IN;
#endif
}
@ -306,6 +322,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateChainFile
jint ret = 0;
const char* chainFile;
(void)jcl;
if (!jenv || !ssl)
return SSL_FAILURE;
@ -321,6 +339,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateChainFile
return ret;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)file;
return NOT_COMPILED_IN;
#endif
}
@ -330,6 +352,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setUsingNonblock
{
jclass excClass;
(void)jcl;
if (!jenv)
return;
@ -352,6 +376,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getUsingNonblock
{
jclass excClass;
(void)jcl;
if (!jenv)
return 0;
@ -374,6 +400,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getFd
{
jclass excClass;
(void)jcl;
if (!jenv)
return 0;
@ -397,6 +425,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_connect
{
int ret = 0;
(void)jcl;
if (!jenv || !ssl)
return SSL_FATAL_ERROR;
@ -423,6 +453,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_write(JNIEnv* jenv,
byte* data;
int ret = SSL_FAILURE;
(void)jcl;
if (!jenv || !ssl || !raw)
return BAD_FUNC_ARG;
@ -450,6 +482,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_read(JNIEnv* jenv,
byte* data;
int size = 0;
(void)jcl;
if (!jenv || !ssl || !raw)
return BAD_FUNC_ARG;
@ -472,6 +506,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_read(JNIEnv* jenv,
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_accept
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
if (!jenv || !ssl)
return SSL_FATAL_ERROR;
@ -484,6 +520,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_freeSSL
jobject* g_cachedSSLObj;
jclass excClass;
(void)jcl;
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if (!ssl) {
@ -524,6 +562,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_freeSSL
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_shutdownSSL
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -534,6 +574,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_shutdownSSL
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getError
(JNIEnv* jenv, jobject jcl, jlong ssl, jint ret)
{
(void)jcl;
if (!jenv)
return SSL_FAILURE;
@ -544,6 +586,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getError
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setSession
(JNIEnv* jenv, jobject jcl, jlong ssl, jlong session)
{
(void)jcl;
if (!jenv || !ssl)
return SSL_FAILURE;
@ -555,8 +599,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setSession
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getSession
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
/* wolfSSL checks ssl for NULL */
return (jlong)wolfSSL_get_session((WOLFSSL*)(intptr_t)ssl);
return (jlong)(intptr_t)wolfSSL_get_session((WOLFSSL*)(intptr_t)ssl);
}
JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getSessionID
@ -591,18 +638,27 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getSessionID
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setTimeout
(JNIEnv* jenv, jobject jcl, jlong ssl, jlong t)
{
(void)jenv;
(void)jcl;
return wolfSSL_set_timeout((WOLFSSL*)(intptr_t)ssl, (unsigned int)t);
}
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getTimeout
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
return wolfSSL_get_timeout((WOLFSSL*)(intptr_t)ssl);
}
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setSessTimeout
(JNIEnv* jenv, jobject jcl, jlong session, jlong sz)
{
(void)jenv;
(void)jcl;
return wolfSSL_SSL_SESSION_set_timeout((WOLFSSL_SESSION*)(intptr_t)session,
sz);
}
@ -610,6 +666,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setSessTimeout
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getSessTimeout
(JNIEnv* jenv, jobject jcl, jlong session)
{
(void)jenv;
(void)jcl;
return wolfSSL_SESSION_get_timeout((WOLFSSL_SESSION*)(intptr_t)session);
}
@ -620,6 +679,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setCipherList
jint ret = 0;
const char* cipherList;
(void)jcl;
if (!jenv || !ssl || !list)
return SSL_FAILURE;
@ -638,6 +699,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtlsGetCurrentTimeout
#if !defined(WOLFSSL_LEANPSK) && defined(WOLFSSL_DTLS)
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -653,6 +716,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtlsGetCurrentTimeout
return wolfSSL_dtls_get_current_timeout((WOLFSSL*)(intptr_t)ssl);
#else
(void)jenv;
(void)jcl;
(void)ssl;
return NOT_COMPILED_IN;
#endif
}
@ -663,6 +729,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtlsGotTimeout
#if !defined(WOLFSSL_LEANPSK) && defined(WOLFSSL_DTLS)
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -678,6 +746,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtlsGotTimeout
return wolfSSL_dtls_got_timeout((WOLFSSL*)(intptr_t)ssl);
#else
(void)jenv;
(void)jcl;
(void)ssl;
return NOT_COMPILED_IN;
#endif
}
@ -687,6 +758,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtls
{
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -710,6 +783,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_dtlsSetPeer
struct sockaddr_in sa;
const char* ipAddress = NULL;
(void)jcl;
if (!jenv || !ssl || !peer)
return SSL_FAILURE;
@ -829,6 +904,8 @@ JNIEXPORT jobject JNICALL Java_com_wolfssl_WolfSSLSession_dtlsGetPeer
jmethodID constr;
jstring ipAddr;
(void)jcl;
if (!jenv || !ssl)
return NULL;
@ -894,6 +971,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_sessionReused
{
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -915,6 +994,8 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getPeerCertificate
#ifdef KEEP_PEER_CERT
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -929,6 +1010,9 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getPeerCertificate
return (long)wolfSSL_get_peer_certificate((WOLFSSL*)(intptr_t)ssl);
#else
(void)jenv;
(void)jcl;
(void)ssl;
return NOT_COMPILED_IN;
#endif
}
@ -942,6 +1026,7 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Issuer
char* issuer;
jstring retString;
(void)jcl;
if (!x509)
return NULL;
@ -968,6 +1053,10 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Issuer
return retString;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)x509;
return NULL;
#endif
}
@ -981,6 +1070,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Subject
char* subject;
jstring retString;
(void)jcl;
if (!x509)
return NULL;
@ -1006,6 +1097,10 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Subject
return retString;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)x509;
return NULL;
#endif
}
@ -1018,6 +1113,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509AltName
char* altname;
jstring retString;
(void)jcl;
if (!x509)
return NULL;
@ -1040,6 +1137,10 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509AltName
return retString;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)x509;
return NULL;
#endif
}
@ -1049,6 +1150,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getVersion
{
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1071,6 +1174,8 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_getCurrentCipher
{
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1094,6 +1199,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_checkDomainName
const char* dname;
jclass excClass;
(void)jcl;
if(!dn)
return SSL_FAILURE;
@ -1127,6 +1234,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setTmpDH
unsigned char gBuf[gSz];
jclass excClass;
(void)jcl;
if (!jenv || !p || !g) {
return BAD_FUNC_ARG;
}
@ -1169,6 +1278,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setTmpDHFile
const char* fname;
jclass excClass;
(void)jcl;
if (!file)
return SSL_BAD_FILE;
@ -1200,6 +1311,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateBuffer
unsigned char buff[sz];
jclass excClass;
(void)jcl;
if (!jenv || !in)
return BAD_FUNC_ARG;
@ -1233,6 +1346,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePrivateKeyBuffer
unsigned char buff[sz];
jclass excClass;
(void)jcl;
if (!jenv || !in)
return BAD_FUNC_ARG;
@ -1266,6 +1381,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_useCertificateChainBuffer
unsigned char buff[sz];
jclass excClass;
(void)jcl;
if (!jenv || !in)
return BAD_FUNC_ARG;
@ -1298,6 +1415,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setGroupMessages
{
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1319,6 +1438,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_enableCRL
#ifdef HAVE_CRL
jclass excClass;
(void)jcl;
if (!jenv)
return BAD_FUNC_ARG;
@ -1337,6 +1458,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_enableCRL
return wolfSSL_EnableCRL((WOLFSSL*)(intptr_t)ssl, options);
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)options;
return NOT_COMPILED_IN;
#endif
}
@ -1347,6 +1472,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_disableCRL
#ifdef HAVE_CRL
jclass excClass;
(void)jcl;
if (!jenv)
return BAD_FUNC_ARG;
@ -1365,6 +1492,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_disableCRL
return wolfSSL_DisableCRL((WOLFSSL*)(intptr_t)ssl);
#else
(void)jenv;
(void)jcl;
(void)ssl;
return NOT_COMPILED_IN;
#endif
}
@ -1377,6 +1507,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_loadCRL
const char* crlPath;
jclass excClass;
(void)jcl;
if (!jenv || !path)
return BAD_FUNC_ARG;
@ -1401,6 +1533,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_loadCRL
return ret;
#else
(void)jenv;
(void)jcl;
(void)path;
(void)type;
(void)monitor;
return NOT_COMPILED_IN;
#endif
}
@ -1412,6 +1549,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setCRLCb
int ret = 0;
jclass excClass;
(void)jcl;
if (!jenv || !cb) {
return BAD_FUNC_ARG;
}
@ -1442,6 +1581,10 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setCRLCb
return ret;
#else
(void)jenv;
(void)jcl;
(void)ssl;
(void)cb;
return NOT_COMPILED_IN;
#endif
}
@ -1536,6 +1679,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_cipherGetName
WOLFSSL_CIPHER* cipher;
jclass excClass;
(void)jcl;
if (!ssl) {
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1569,6 +1714,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getMacSecret
const unsigned char* secret;
#endif
(void)jcl;
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1631,6 +1778,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getClientWriteKey
const unsigned char* key;
#endif
(void)jcl;
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1693,6 +1842,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getClientWriteIV
int ivLength;
#endif
(void)jcl;
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1755,6 +1906,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getServerWriteKey
int keyLength;
#endif
(void)jcl;
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1817,6 +1970,8 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getServerWriteIV
int ivLength;
#endif
(void)jcl;
/* find exception class */
excClass = (*jenv)->FindClass(jenv, "com/wolfssl/WolfSSLException");
if ((*jenv)->ExceptionOccurred(jenv)) {
@ -1872,6 +2027,9 @@ JNIEXPORT jbyteArray JNICALL Java_com_wolfssl_WolfSSLSession_getServerWriteIV
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getKeySize
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetKeySize((WOLFSSL*)(intptr_t)ssl);
@ -1883,6 +2041,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getKeySize
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getSide
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetSide((WOLFSSL*)(intptr_t)ssl);
@ -1894,6 +2055,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getSide
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_isTLSv1_11
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_IsTLSv1_1((WOLFSSL*)(intptr_t)ssl);
@ -1905,6 +2069,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_isTLSv1_11
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getBulkCipher
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetBulkCipher((WOLFSSL*)(intptr_t)ssl);
@ -1916,6 +2083,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getBulkCipher
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getCipherBlockSize
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetCipherBlockSize((WOLFSSL*)(intptr_t)ssl);
@ -1927,6 +2097,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getCipherBlockSize
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getAeadMacSize
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetAeadMacSize((WOLFSSL*)(intptr_t)ssl);
@ -1938,6 +2111,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getAeadMacSize
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getHmacSize
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetHmacSize((WOLFSSL*)(intptr_t)ssl);
@ -1949,6 +2125,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getHmacSize
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getHmacType
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetHmacType((WOLFSSL*)(intptr_t)ssl);
}
@ -1956,6 +2135,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getHmacType
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getCipherType
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
#ifdef ATOMIC_USER
/* wolfSSL checks ssl for NULL */
return wolfSSL_GetCipherType((WOLFSSL*)(intptr_t)ssl);
@ -1971,6 +2153,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setTlsHmacInner
int ret = 0;
unsigned char hmacInner[WOLFSSL_TLS_HMAC_INNER_SZ];
(void)jcl;
if (!jenv || inner == NULL || !ssl) {
return BAD_FUNC_ARG;
}
@ -2529,6 +2713,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setRsaDecCtx
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setPskClientCb
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -2561,6 +2747,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setPskClientCb
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setPskServerCb
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -2593,6 +2781,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setPskServerCb
JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPskIdentityHint
(JNIEnv* jenv, jobject obj, jlong ssl)
{
(void)obj;
#ifndef NO_PSK
if (!jenv || !ssl)
return NULL;
@ -2600,6 +2789,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPskIdentityHint
return (*jenv)->NewStringUTF(jenv,
wolfSSL_get_psk_identity_hint((WOLFSSL*)(intptr_t)ssl));
#else
(void)jenv;
(void)ssl;
return NULL;
#endif
}
@ -2607,6 +2798,7 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPskIdentityHint
JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPskIdentity
(JNIEnv* jenv, jobject obj, jlong ssl)
{
(void)obj;
#ifndef NO_PSK
if (!jenv || !ssl)
return NULL;
@ -2614,6 +2806,8 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPskIdentity
return (*jenv)->NewStringUTF(jenv,
wolfSSL_get_psk_identity((WOLFSSL*)(intptr_t)ssl));
#else
(void)jenv;
(void)ssl;
return NULL;
#endif
}
@ -2625,6 +2819,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePskIdentityHint
jint ret;
const char* nativeHint;
(void)obj;
if (!jenv || !ssl || !hint)
return SSL_FAILURE;
@ -2637,6 +2833,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePskIdentityHint
return ret;
#else
(void)jenv;
(void)ssl;
(void)hint;
return NOT_COMPILED_IN;
#endif
}
@ -2644,6 +2843,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_usePskIdentityHint
JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSLSession_handshakeDone
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
if (!jenv || !ssl)
return JNI_FALSE;
@ -2658,6 +2859,8 @@ JNIEXPORT jboolean JNICALL Java_com_wolfssl_WolfSSLSession_handshakeDone
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setConnectState
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
if (!jenv || !ssl)
return;
@ -2667,6 +2870,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setConnectState
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setAcceptState
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
if (!jenv || !ssl)
return;
@ -2676,6 +2881,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setAcceptState
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setVerify
(JNIEnv* jenv, jobject jcl, jlong ssl, jint mode, jobject callbackIface)
{
(void)jcl;
if (!jenv || !ssl)
return;
@ -2698,6 +2905,8 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setVerify
JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_setOptions
(JNIEnv* jenv, jobject jcl, jlong ssl, jlong op)
{
(void)jcl;
if (!jenv || !ssl)
return 0;
@ -2707,12 +2916,17 @@ JNIEXPORT jlong JNICALL Java_com_wolfssl_WolfSSLSession_setOptions
JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_getShutdown
(JNIEnv *jenv, jobject jcl, jlong ssl)
{
(void)jenv;
(void)jcl;
return (jint)wolfSSL_get_shutdown((WOLFSSL*)(intptr_t)ssl);
}
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setSSLIORecv
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
/* find exception class */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");
@ -2864,6 +3078,8 @@ int NativeSSLIORecvCb(WOLFSSL *ssl, char *buf, int sz, void *ctx)
JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLSession_setSSLIOSend
(JNIEnv* jenv, jobject jcl, jlong ssl)
{
(void)jcl;
/* find exception class in case we need it */
jclass excClass = (*jenv)->FindClass(jenv,
"com/wolfssl/WolfSSLJNIException");

View File

@ -34,6 +34,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_RSA_doSign
unsigned int idx;
unsigned int tmpOut;
(void)jcl;
/* check in and key sz */
if ((inSz < 0) || (keySz < 0)) {
return -1;
@ -93,6 +95,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_RSA_doVerify
RsaKey myKey;
unsigned int idx;
(void)jcl;
/* check in and key sz */
if ((sigSz < 0) || (keySz < 0) || (outSz < 0)) {
return -1;
@ -147,6 +151,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_RSA_doEnc
unsigned int idx;
unsigned int tmpOut;
(void)jcl;
/* check in and key sz */
if ((inSz < 0) || (keySz < 0)) {
return -1;
@ -205,6 +211,8 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_RSA_doDec
RsaKey myKey;
unsigned int idx;
(void)jcl;
/* check in and key sz */
if ((inSz < 0) || (keySz < 0) || (outSz < 0)) {
return -1;