Merge pull request #210 from rlm2002/timeouts

read returns error value to timeout
wolfSSL · Jul 19, 2024 · 13da2b0 · 13da2b0
2 parents a5863a4 + 8f09aae
commit 13da2b0
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/native/com_wolfssl_WolfSSLSession.c b/native/com_wolfssl_WolfSSLSession.c
@@ -1083,16 +1083,12 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_read
                     (ret == WOLFJNI_IO_EVENT_SEND_READY)) {
                     /* loop around and try wolfSSL_read() again */
                     continue;
-                } else if (ret == WOLFJNI_IO_EVENT_TIMEOUT ||
-                           ret == WOLFJNI_IO_EVENT_FD_CLOSED ||
-                           ret == WOLFJNI_IO_EVENT_ERROR ||
-                           ret == WOLFJNI_IO_EVENT_POLLHUP ||
-                           ret == WOLFJNI_IO_EVENT_FAIL) {
-                    /* Java will throw SocketTimeoutException or
-                     * SocketException */
-                    break;
                 } else {
-                    /* other error occurred */
+                    /* Java will throw SocketTimeoutException or
+                    * SocketException if ret equals
+                    * WOLFJNI_IO_EVENT_TIMEOUT, WOLFJNI_IO_EVENT_FD_CLOSED
+                    * WOLFJNI_IO_EVENT_ERROR, WOLFJNI_IO_EVENT_POLLHUP or
+                    * WOLFJNI_IO_EVENT_FAIL */
                     size = ret;
                     break;
                 }