Replace deprecated OpenSSL function ERR_remove_state()

ERR_remove_state() has been deprecated. ERR_remove_thread_state() should be used in its place instead. Change-Id: If0d2895cd331f94ad383e8666b84e15bfc035d3a Reviewed-on: http://gerrit.cloudera.org:8080/6556 Reviewed-by: Todd Lipcon <[email protected]> Tested-by: Kudu Jenkins
timarmstrong · Apr 19, 2017 · 6200da9 · 6200da9
1 parent d5b9894
commit 6200da9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/kudu/rpc/reactor.cc b/src/kudu/rpc/reactor.cc
@@ -152,6 +152,9 @@ void ReactorThread::ShutdownInternal() {
     task->Abort(aborted); // should also free the task.
   }
   scheduled_tasks_.clear();
+
+  // Remove the OpenSSL thread state.
+  ERR_remove_thread_state(nullptr);
 }
 
 ReactorTask::ReactorTask() {

diff --git a/src/kudu/security/tls_socket.cc b/src/kudu/security/tls_socket.cc
@@ -147,7 +147,6 @@ Status TlsSocket::Close() {
   }
 
   ssl_.reset();
-  ERR_remove_state(0);
 
   // Close the underlying socket.
   RETURN_NOT_OK(Socket::Close());