Skip to content
Snippets Groups Projects
Commit bebd0b64 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Only tls servers should call destroy_session()

TLS clients don't (currently) add a certificate, so there's no need
to delete it.
parent 63035314
No related branches found
No related tags found
No related merge requests found
Pipeline #5327 passed
...@@ -215,7 +215,10 @@ static void do_js_close(JSContext *cx, js_socket_private_t *p, bool finalize) ...@@ -215,7 +215,10 @@ static void do_js_close(JSContext *cx, js_socket_private_t *p, bool finalize)
size_t i; size_t i;
if(p->session != -1) { if(p->session != -1) {
if (p->tls_server)
destroy_session(lprintf, p->session); destroy_session(lprintf, p->session);
else
cryptDestroySession(p->session);
p->session=-1; p->session=-1;
} }
...@@ -2308,7 +2311,10 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict ...@@ -2308,7 +2311,10 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict
break; break;
case SOCK_PROP_DESCRIPTOR: case SOCK_PROP_DESCRIPTOR:
if(p->session != -1) { if(p->session != -1) {
if (p->tls_server)
destroy_session(lprintf, p->session); destroy_session(lprintf, p->session);
else
cryptDestroySession(p->session);
p->session=-1; p->session=-1;
} }
if(JS_ValueToInt32(cx,*vp,&i)) if(JS_ValueToInt32(cx,*vp,&i))
...@@ -2389,7 +2395,10 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict ...@@ -2389,7 +2395,10 @@ static JSBool js_socket_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict
} }
else { else {
if(p->session != -1) { if(p->session != -1) {
if (p->tls_server)
destroy_session(lprintf, p->session); destroy_session(lprintf, p->session);
else
cryptDestroySession(p->session);
p->session=-1; p->session=-1;
ioctlsocket(p->sock,FIONBIO,(ulong*)&(p->nonblocking)); ioctlsocket(p->sock,FIONBIO,(ulong*)&(p->nonblocking));
do_js_close(cx, p, false); do_js_close(cx, p, false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment