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

JSSE: delay creation of WolfSSLImplementSSLSession objects until needed, reduces overall memory usage by active objects

pull/154/head
Chris Conlon 2023-10-18 10:43:52 -06:00
parent 544e054ce3
commit 90a1f0308c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/wolfssl/provider/jsse/WolfSSLAuthStore.java
View File

@ -348,11 +348,6 @@ public class WolfSSLAuthStore {
* after the resumed session completes the handshake, for * after the resumed session completes the handshake, for
* subsequent resumption attempts to use. */ * subsequent resumption attempts to use. */
store.remove(toHash.hashCode()); store.remove(toHash.hashCode());
/* Make copy/clone of session object so multiple threads
* don't try to use the same cache entry. Cache entry will
* be overwritten when new session with same key is stored */
ses = new WolfSSLImplementSSLSession(ses);
ses.isFromTable = true; ses.isFromTable = true;
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,

9
src/java/com/wolfssl/provider/jsse/WolfSSLEngineHelper.java
View File

@ -80,7 +80,6 @@ public class WolfSSLEngineHelper {
this.ssl = ssl; this.ssl = ssl;
this.params = params; this.params = params;
this.authStore = store; this.authStore = store;
this.session = new WolfSSLImplementSSLSession(store);
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
"created new WolfSSLEngineHelper()"); "created new WolfSSLEngineHelper()");
@ -107,7 +106,6 @@ public class WolfSSLEngineHelper {
this.port = port; this.port = port;
this.hostname = hostname; this.hostname = hostname;
this.authStore = store; this.authStore = store;
this.session = new WolfSSLImplementSSLSession(store);
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
"created new WolfSSLEngineHelper(port: " + port + "created new WolfSSLEngineHelper(port: " + port +
", hostname: " + hostname + ")"); ", hostname: " + hostname + ")");
@ -140,7 +138,10 @@ public class WolfSSLEngineHelper {
* @return WolfSSLImplementSession for this object * @return WolfSSLImplementSession for this object
*/ */
protected WolfSSLImplementSSLSession getSession() { protected WolfSSLImplementSSLSession getSession() {
return session; if (this.session == null) {
this.session = new WolfSSLImplementSSLSession(authStore);
}
return this.session;
} }
/** /**
@ -823,7 +824,7 @@ public class WolfSSLEngineHelper {
return WolfSSL.SSL_HANDSHAKE_FAILURE; return WolfSSL.SSL_HANDSHAKE_FAILURE;
} }
if (!this.session.isValid()) { if ((this.session == null) || !this.session.isValid()) {
WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO, WolfSSLDebug.log(getClass(), WolfSSLDebug.INFO,
"session is marked as invalid, try creating a new seesion"); "session is marked as invalid, try creating a new seesion");
if (this.sessionCreation == false) { if (this.sessionCreation == false) {