summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2016-08-31 15:49:11 +0200
committerLinus Nordberg <linus@nordu.net>2016-09-21 13:15:11 +0200
commit00a6c67786a0716749e0cbb1600dd1dbc54d693f (patch)
tree65ded464e11bcbf41f5c67b2b0392c5d063070db
parenteb85a9842b4dbc5769f407a7253a276afb1f1ae4 (diff)
Don't call ERR_remove_thread_state().
Not needed as of openssl-1.1, see https://www.openssl.org/docs/man1.1.0/crypto/ERR_remove_thread_state.html
-rw-r--r--dtls.c3
-rw-r--r--radsecproxy.c1
-rw-r--r--tls.c3
3 files changed, 0 insertions, 7 deletions
diff --git a/dtls.c b/dtls.c
index 0d8da2e..7dc9c72 100644
--- a/dtls.c
+++ b/dtls.c
@@ -285,7 +285,6 @@ void *dtlsserverwr(void *arg) {
/* ssl might have changed while waiting */
pthread_mutex_unlock(&replyq->mutex);
debug(DBG_DBG, "dtlsserverwr: exiting as requested");
- ERR_remove_thread_state(0);
pthread_exit(NULL);
}
}
@@ -407,7 +406,6 @@ exit:
params->sesscache->expiry.tv_sec += delay;
pthread_mutex_unlock(&params->sesscache->mutex);
free(params);
- ERR_remove_thread_state(0);
pthread_exit(NULL);
debug(DBG_DBG, "dtlsservernew: exiting");
}
@@ -664,7 +662,6 @@ void *dtlsclientrd(void *arg) {
}
replyh(server, buf);
}
- ERR_remove_thread_state(0);
server->clientrdgone = 1;
return NULL;
}
diff --git a/radsecproxy.c b/radsecproxy.c
index 7735a5c..c247d5c 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1983,7 +1983,6 @@ errexit:
freeclsrvconf(conf);
}
freeserver(server, 1);
- ERR_remove_thread_state(0);
return NULL;
}
diff --git a/tls.c b/tls.c
index d127d7b..f1b0f29 100644
--- a/tls.c
+++ b/tls.c
@@ -291,7 +291,6 @@ void *tlsclientrd(void *arg) {
}
}
debug(DBG_INFO, "tlsclientrd: exiting for %s", server->conf->name);
- ERR_remove_thread_state(0);
SSL_shutdown(server->ssl);
shutdown(server->sock, SHUT_RDWR);
close(server->sock);
@@ -325,7 +324,6 @@ void *tlsserverwr(void *arg) {
/* ssl might have changed while waiting */
pthread_mutex_unlock(&replyq->mutex);
debug(DBG_DBG, "tlsserverwr: exiting as requested");
- ERR_remove_thread_state(0);
pthread_exit(NULL);
}
}
@@ -451,7 +449,6 @@ exit:
SSL_shutdown(ssl);
SSL_free(ssl);
}
- ERR_remove_thread_state(0);
shutdown(s, SHUT_RDWR);
close(s);
pthread_exit(NULL);