Merge pull request #217 from cconlon/SSLSocketEndOfStreamRead

JSSE: return end of stream in WolfSSLInputStream.read() on SOCKET_ERROR_E
wolfSSL · Sep 12, 2024 · a9c28d7 · a9c28d7
2 parents 7ee9c7d + 1b3c748
commit a9c28d7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/native/com_wolfssl_WolfSSL.h b/native/com_wolfssl_WolfSSL.h
diff --git a/src/java/com/wolfssl/WolfSSL.java b/src/java/com/wolfssl/WolfSSL.java
@@ -202,8 +202,10 @@ public enum TLS_VERSION {
     public static final int SSL_ERROR_WANT_X509_LOOKUP = 83;
     /** I/O error, zero return, no more data */
     public static final int SSL_ERROR_ZERO_RETURN      =  6;
-    /** Generatl SSL error */
+    /** General SSL error */
     public static final int SSL_ERROR_SSL              = 85;
+    /** Error state on socket */
+    public static final int SOCKET_ERROR_E             = -308;
     /** Received fatal alert error */
     public static final int FATAL_ERROR                = -313;
     /** Peer closed socket */

diff --git a/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java b/src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java
@@ -2514,12 +2514,22 @@ public synchronized int read(byte[] b, int off, int len)
                     /* other errors besides end of stream or WANT_READ
                      * are treated as I/O errors and throw an exception */
                     String errStr = WolfSSL.getErrorString(err);
-                    WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
-                        "Native wolfSSL_read() error: " + errStr +
-                        " (error code: " + err + ")");
-                    throw new IOException("Native wolfSSL_read() " +
-                        "error: " + errStr +
-                        " (error code: " + err + ")");
+                    if (err == WolfSSL.SOCKET_ERROR_E) {
+                        /* Socket error, indicate to caller by returning
+                         * end of stream */
+                        WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                            "Native wolfSSL_read() error: " + errStr +
+                            " (error code: " + err + "), end of stream");
+                        return -1;
+
+                    } else {
+                        WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
+                            "Native wolfSSL_read() error: " + errStr +
+                            " (error code: " + err + ")");
+                        throw new IOException("Native wolfSSL_read() " +
+                            "error: " + errStr +
+                            " (error code: " + err + ")");
+                    }
                 }
 
             } catch (SocketException e) {