WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SSLEngine: only save session to client cache if handshake has finished and no error

pull/193/head
Chris Conlon 2024-05-14 14:50:59 -06:00
parent b08237d910
commit 5bd7a48c20
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java
View File

@ -352,9 +352,14 @@ public class WolfSSLEngine extends SSLEngine {
/* Save session into WolfSSLAuthStore cache, saves session /* Save session into WolfSSLAuthStore cache, saves session
* pointer for resumption if on client side. Protected with ioLock * pointer for resumption if on client side. Protected with ioLock
* since underlying get1Session can use I/O with peek. */ * since underlying get1Session can use I/O with peek.
if (!this.sessionStored) { *
synchronized (ioLock) { * Only store session if handshake is finished, SSL_get_error() does
* not have an active error state, and the session has not been
* stored previously. */
synchronized (ioLock) {
if (this.handshakeFinished && (ssl.getError(0) == 0) &&
!this.sessionStored) {
this.engineHelper.saveSession(); this.engineHelper.saveSession();
} }
} }
@ -1025,8 +1030,9 @@ public class WolfSSLEngine extends SSLEngine {
* we may need to wait for session ticket. We do try * we may need to wait for session ticket. We do try
* right after wolfSSL_connect/accept() finishes, but * right after wolfSSL_connect/accept() finishes, but
* we might not have had session ticket at that time. */ * we might not have had session ticket at that time. */
if (!this.sessionStored) { synchronized (ioLock) {
synchronized (ioLock) { if (this.handshakeFinished && (ssl.getError(0) == 0) &&
!this.sessionStored) {
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
"calling engineHelper.saveSession()"); "calling engineHelper.saveSession()");
int ret2 = this.engineHelper.saveSession(); int ret2 = this.engineHelper.saveSession();