Skip to content

Commit 84ebbf7

Browse files
authored
Merge pull request #354 from rlm2002/eccurvesConstraints
JSSE: SunJSSE test fixes
2 parents 05a95fd + 4d7a3ea commit 84ebbf7

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ else if ((produced > 0) && !inBoundOpen &&
962962
* since we won't be sending anything after the alert went
963963
* out. */
964964
this.outBoundOpen = false;
965+
this.closed = true;
965966
}
966967
else if (produced == 0) {
967968
/* continue handshake or application data */
@@ -1671,6 +1672,7 @@ else if (ret < 0 &&
16711672
* close outbound since we won't be receiving
16721673
* any more data */
16731674
this.outBoundOpen = false;
1675+
this.closed = true;
16741676
}
16751677
/* Throw SSLHandshakeException if handshake not
16761678
* finished, otherwise throw SSLException for

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,9 +2055,6 @@ public synchronized void close() throws IOException {
20552055

20562056
try {
20572057
if (beforeObjectInit == false) {
2058-
/* Ensure SSL state exists before TLS-specific close path. */
2059-
checkAndInitSSLSocket();
2060-
20612058
/* Check if underlying Socket is still open before closing,
20622059
* in case application calls SSLSocket.close() multiple times */
20632060
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,

0 commit comments

Comments
 (0)