JSSE: fix SSLEngine behavior for SSL_shutdown() when WOLFSSL_ERROR_CODE_OPENSSL is defined

Author: cconlon

src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java

@@ -203,7 +203,11 @@ private int ClosingConnection() {
             this.outBoundOpen = false;
             hs = SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
         }
-        else if (ret == WolfSSL.SSL_SHUTDOWN_NOT_DONE) {
+        /* wolfSSL_shutdown() will return either SSL_SHUTDOWN_NOT_DONE (2), or
+         * will map that to 0 if WOLFSSL_ERROR_CODE_OPENSSL is defined. Either
+         * should indicate that the full bidirectional shutdown has not
+         * completed. */
+        else if (ret == WolfSSL.SSL_SHUTDOWN_NOT_DONE || ret == 0) {
             hs = SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
         }
         else {

src/test/com/wolfssl/provider/jsse/test/WolfSSLTestFactory.java

@@ -466,8 +466,8 @@ protected int testConnection(SSLEngine server, SSLEngine client,
                         printHex(serToCli);
                     }
 
-                    System.out.println("cliToSer remaning = " + cliToSer.remaining());
-                    System.out.println("serToCli remaning = " + serToCli.remaining());
+                    System.out.println("cliToSer remaining = " + cliToSer.remaining());
+                    System.out.println("serToCli remaining = " + serToCli.remaining());
                 }
                 result = client.unwrap(serToCli, cliPlain);
                 if (extraDebug) {