kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpe...@apache.org
Subject [2/3] kudu git commit: Replace deprecated OpenSSL function ERR_remove_state()
Date Wed, 19 Apr 2017 01:02:27 GMT
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 <todd@apache.org>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/6200da98
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6200da98
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6200da98

Branch: refs/heads/master
Commit: 6200da9807007a01d22812b47f937354811c370a
Parents: d5b9894
Author: Sailesh Mukil <sailesh@apache.org>
Authored: Tue Apr 4 23:52:47 2017 -0700
Committer: Todd Lipcon <todd@apache.org>
Committed: Wed Apr 19 00:46:46 2017 +0000

----------------------------------------------------------------------
 src/kudu/rpc/reactor.cc         | 3 +++
 src/kudu/security/tls_socket.cc | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/6200da98/src/kudu/rpc/reactor.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/reactor.cc b/src/kudu/rpc/reactor.cc
index 87056d1..1a74aaf 100644
--- 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() {

http://git-wip-us.apache.org/repos/asf/kudu/blob/6200da98/src/kudu/security/tls_socket.cc
----------------------------------------------------------------------
diff --git a/src/kudu/security/tls_socket.cc b/src/kudu/security/tls_socket.cc
index 54c1f14..dbe5c68 100644
--- 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());


Mime
View raw message