You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ab...@apache.org on 2021/09/10 06:21:59 UTC
[kudu] branch master updated: Move openssl_util to util
This is an automated email from the ASF dual-hosted git repository.
abukor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 646fbaa Move openssl_util to util
646fbaa is described below
commit 646fbaacf31857a314b4589196523b04d3ae3f49
Author: Attila Bukor <ab...@apache.org>
AuthorDate: Thu Sep 9 16:55:04 2021 +0200
Move openssl_util to util
As the security libraries depend on utils, utilities can't depend on
security. Some of data at rest encryption's will thus live in util/env,
which would need to use some of the macros/functions defined in
openssl_util, so we need to move this code to util.
Change-Id: I4147cbfbdba9bb3cfee35a542c5e8cb1568fb032
Reviewed-on: http://gerrit.cloudera.org:8080/17838
Tested-by: Kudu Jenkins
Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
src/kudu/client/client-internal.cc | 2 +-
src/kudu/client/client.cc | 2 +-
src/kudu/integration-tests/authz_token-itest.cc | 2 +-
src/kudu/integration-tests/master_cert_authority-itest.cc | 2 +-
src/kudu/integration-tests/security-unknown-tsk-itest.cc | 2 +-
src/kudu/master/catalog_manager.cc | 2 +-
src/kudu/master/master_cert_authority.cc | 2 +-
src/kudu/master/sys_catalog-test.cc | 2 +-
src/kudu/rpc/messenger.cc | 2 +-
src/kudu/security/CMakeLists.txt | 1 -
src/kudu/security/ca/cert_management-test.cc | 2 +-
src/kudu/security/ca/cert_management.cc | 2 +-
src/kudu/security/ca/cert_management.h | 2 +-
src/kudu/security/cert-test.cc | 2 +-
src/kudu/security/cert.cc | 4 ++--
src/kudu/security/cert.h | 2 +-
src/kudu/security/crypto-test.cc | 2 +-
src/kudu/security/crypto.cc | 4 ++--
src/kudu/security/crypto.h | 2 +-
src/kudu/security/tls_context.cc | 2 +-
src/kudu/security/tls_context.h | 2 +-
src/kudu/security/tls_handshake-test.cc | 2 +-
src/kudu/security/tls_handshake.cc | 2 +-
src/kudu/security/tls_handshake.h | 2 +-
src/kudu/security/tls_socket.cc | 2 +-
src/kudu/security/tls_socket.h | 2 +-
src/kudu/security/token-test.cc | 2 +-
src/kudu/security/token_signing_key.cc | 2 +-
src/kudu/server/webserver.cc | 2 +-
src/kudu/tserver/heartbeater.cc | 2 +-
src/kudu/tserver/tablet_server_authorization-test.cc | 2 +-
src/kudu/util/CMakeLists.txt | 3 +++
src/kudu/util/curl_util.cc | 2 +-
src/kudu/{security => util}/openssl_util.cc | 2 +-
src/kudu/{security => util}/openssl_util.h | 0
src/kudu/{security => util}/openssl_util_bio.h | 2 +-
36 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/kudu/client/client-internal.cc b/src/kudu/client/client-internal.cc
index 95624d2..ef65685 100644
--- a/src/kudu/client/client-internal.cc
+++ b/src/kudu/client/client-internal.cc
@@ -61,13 +61,13 @@
#include "kudu/rpc/rpc.h"
#include "kudu/rpc/rpc_controller.h"
#include "kudu/security/cert.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/util/async_util.h"
#include "kudu/util/logging.h"
#include "kudu/util/net/dns_resolver.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/thread_restrictions.h"
DECLARE_int32(dns_resolver_max_threads_num);
diff --git a/src/kudu/client/client.cc b/src/kudu/client/client.cc
index 1ed91fa..7e3d141 100644
--- a/src/kudu/client/client.cc
+++ b/src/kudu/client/client.cc
@@ -87,7 +87,6 @@
#include "kudu/rpc/sasl_common.h"
#include "kudu/rpc/user_credentials.h"
#include "kudu/security/cert.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/security/token.pb.h"
#include "kudu/tserver/tserver.pb.h"
@@ -100,6 +99,7 @@
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/oid_generator.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/version_info.h"
diff --git a/src/kudu/integration-tests/authz_token-itest.cc b/src/kudu/integration-tests/authz_token-itest.cc
index 4c58df7..ddc9dcc 100644
--- a/src/kudu/integration-tests/authz_token-itest.cc
+++ b/src/kudu/integration-tests/authz_token-itest.cc
@@ -47,12 +47,12 @@
#include "kudu/master/mini_master.h"
#include "kudu/mini-cluster/internal_mini_cluster.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/tablet/key_value_test_schema.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
diff --git a/src/kudu/integration-tests/master_cert_authority-itest.cc b/src/kudu/integration-tests/master_cert_authority-itest.cc
index 925969c..d792d47 100644
--- a/src/kudu/integration-tests/master_cert_authority-itest.cc
+++ b/src/kudu/integration-tests/master_cert_authority-itest.cc
@@ -46,11 +46,11 @@
#include "kudu/security/ca/cert_management.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/util/countdown_latch.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/integration-tests/security-unknown-tsk-itest.cc b/src/kudu/integration-tests/security-unknown-tsk-itest.cc
index 7811773..57d61a6 100644
--- a/src/kudu/integration-tests/security-unknown-tsk-itest.cc
+++ b/src/kudu/integration-tests/security-unknown-tsk-itest.cc
@@ -44,12 +44,12 @@
#include "kudu/mini-cluster/internal_mini_cluster.h"
#include "kudu/rpc/messenger.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_verifier.h"
#include "kudu/tablet/key_value_test_schema.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
diff --git a/src/kudu/master/catalog_manager.cc b/src/kudu/master/catalog_manager.cc
index b0d9b0d..6497246 100644
--- a/src/kudu/master/catalog_manager.cc
+++ b/src/kudu/master/catalog_manager.cc
@@ -116,7 +116,6 @@
#include "kudu/rpc/rpc_controller.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
@@ -139,6 +138,7 @@
#include "kudu/util/monotime.h"
#include "kudu/util/mutex.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/random_util.h"
#include "kudu/util/scoped_cleanup.h"
diff --git a/src/kudu/master/master_cert_authority.cc b/src/kudu/master/master_cert_authority.cc
index 8467e4a..ab9327a 100644
--- a/src/kudu/master/master_cert_authority.cc
+++ b/src/kudu/master/master_cert_authority.cc
@@ -29,9 +29,9 @@
#include "kudu/security/ca/cert_management.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
using boost::optional;
diff --git a/src/kudu/master/sys_catalog-test.cc b/src/kudu/master/sys_catalog-test.cc
index feea412..67957c7 100644
--- a/src/kudu/master/sys_catalog-test.cc
+++ b/src/kudu/master/sys_catalog-test.cc
@@ -36,11 +36,11 @@
#include "kudu/rpc/messenger.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/cow_object.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
diff --git a/src/kudu/rpc/messenger.cc b/src/kudu/rpc/messenger.cc
index a517a6f..af8d724 100644
--- a/src/kudu/rpc/messenger.cc
+++ b/src/kudu/rpc/messenger.cc
@@ -42,13 +42,13 @@
#include "kudu/rpc/sasl_common.h"
#include "kudu/rpc/server_negotiation.h"
#include "kudu/rpc/service_if.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/security/token_verifier.h"
#include "kudu/util/flags.h"
#include "kudu/util/metrics.h"
#include "kudu/util/monotime.h"
#include "kudu/util/net/socket.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
#include "kudu/util/thread_restrictions.h"
#include "kudu/util/threadpool.h"
diff --git a/src/kudu/security/CMakeLists.txt b/src/kudu/security/CMakeLists.txt
index 7abaabb..e4ddbaa 100644
--- a/src/kudu/security/CMakeLists.txt
+++ b/src/kudu/security/CMakeLists.txt
@@ -70,7 +70,6 @@ set(SECURITY_SRCS
kerberos_util.cc
gssapi.cc
init.cc
- openssl_util.cc
${PORTED_X509_CHECK_HOST_CC}
security_flags.cc
simple_acl.cc
diff --git a/src/kudu/security/ca/cert_management-test.cc b/src/kudu/security/ca/cert_management-test.cc
index 32a3cb2..19c6aa6 100644
--- a/src/kudu/security/ca/cert_management-test.cc
+++ b/src/kudu/security/ca/cert_management-test.cc
@@ -29,9 +29,9 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/security-test-util.h"
#include "kudu/security/test/test_certs.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
diff --git a/src/kudu/security/ca/cert_management.cc b/src/kudu/security/ca/cert_management.cc
index 32f0fba..26debcb 100644
--- a/src/kudu/security/ca/cert_management.cc
+++ b/src/kudu/security/ca/cert_management.cc
@@ -35,7 +35,7 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/security/ca/cert_management.h b/src/kudu/security/ca/cert_management.h
index fdf3b71..356c2ea 100644
--- a/src/kudu/security/ca/cert_management.h
+++ b/src/kudu/security/ca/cert_management.h
@@ -32,8 +32,8 @@
#include "kudu/gutil/macros.h"
#include "kudu/gutil/port.h"
#include "kudu/gutil/strings/stringpiece.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/locks.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/monotime.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/security/cert-test.cc b/src/kudu/security/cert-test.cc
index 016a8ff..83e5fb9 100644
--- a/src/kudu/security/cert-test.cc
+++ b/src/kudu/security/cert-test.cc
@@ -30,9 +30,9 @@
#include "kudu/gutil/strings/strip.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/test/test_certs.h"
#include "kudu/util/barrier.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
diff --git a/src/kudu/security/cert.cc b/src/kudu/security/cert.cc
index c98bc07..f6e9c8e 100644
--- a/src/kudu/security/cert.cc
+++ b/src/kudu/security/cert.cc
@@ -36,8 +36,8 @@
#include "kudu/gutil/macros.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
-#include "kudu/security/openssl_util_bio.h"
+#include "kudu/util/openssl_util.h"
+#include "kudu/util/openssl_util_bio.h"
#include "kudu/util/status.h"
using std::string;
diff --git a/src/kudu/security/cert.h b/src/kudu/security/cert.h
index f47d713..4f9bb01 100644
--- a/src/kudu/security/cert.h
+++ b/src/kudu/security/cert.h
@@ -25,7 +25,7 @@
#include <vector>
#include "kudu/gutil/port.h"
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
typedef struct X509_name_st X509_NAME;
diff --git a/src/kudu/security/crypto-test.cc b/src/kudu/security/crypto-test.cc
index ee17d83..cfced00 100644
--- a/src/kudu/security/crypto-test.cc
+++ b/src/kudu/security/crypto-test.cc
@@ -26,9 +26,9 @@
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/test/test_certs.h"
#include "kudu/util/env.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/path_util.h"
#include "kudu/util/slice.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/security/crypto.cc b/src/kudu/security/crypto.cc
index 23d8cb9..1e0f07a 100644
--- a/src/kudu/security/crypto.cc
+++ b/src/kudu/security/crypto.cc
@@ -33,8 +33,8 @@
#include <glog/logging.h>
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/security/openssl_util.h"
-#include "kudu/security/openssl_util_bio.h"
+#include "kudu/util/openssl_util.h"
+#include "kudu/util/openssl_util_bio.h"
#include "kudu/util/status.h"
using std::string;
diff --git a/src/kudu/security/crypto.h b/src/kudu/security/crypto.h
index 850d215..db5d24f 100644
--- a/src/kudu/security/crypto.h
+++ b/src/kudu/security/crypto.h
@@ -23,7 +23,7 @@
#include <string>
#include "kudu/gutil/port.h"
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
// Forward declarations for the OpenSSL typedefs.
typedef struct bio_st BIO;
diff --git a/src/kudu/security/tls_context.cc b/src/kudu/security/tls_context.cc
index 23826fa..f9cb6fc 100644
--- a/src/kudu/security/tls_context.cc
+++ b/src/kudu/security/tls_context.cc
@@ -44,11 +44,11 @@
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
#include "kudu/security/init.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/security_flags.h"
#include "kudu/security/tls_handshake.h"
#include "kudu/util/flag_tags.h"
#include "kudu/util/net/net_util.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/status.h"
#include "kudu/util/string_case.h"
diff --git a/src/kudu/security/tls_context.h b/src/kudu/security/tls_context.h
index ef78497..b71b094 100644
--- a/src/kudu/security/tls_context.h
+++ b/src/kudu/security/tls_context.h
@@ -27,8 +27,8 @@
#include "kudu/gutil/port.h"
#include "kudu/security/cert.h" // IWYU pragma: keep
-#include "kudu/security/openssl_util.h"
#include "kudu/util/locks.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/rw_mutex.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/security/tls_handshake-test.cc b/src/kudu/security/tls_handshake-test.cc
index c53171f..048ace6 100644
--- a/src/kudu/security/tls_handshake-test.cc
+++ b/src/kudu/security/tls_handshake-test.cc
@@ -34,11 +34,11 @@
#include "kudu/security/ca/cert_management.h"
#include "kudu/security/cert.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/security-test-util.h"
#include "kudu/security/security_flags.h"
#include "kudu/security/tls_context.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
#include "kudu/util/slice.h"
#include "kudu/util/status.h"
diff --git a/src/kudu/security/tls_handshake.cc b/src/kudu/security/tls_handshake.cc
index 90673e7..c313308 100644
--- a/src/kudu/security/tls_handshake.cc
+++ b/src/kudu/security/tls_handshake.cc
@@ -30,9 +30,9 @@
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/security/cert.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_socket.h"
#include "kudu/util/net/socket.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
#include "kudu/util/trace.h"
diff --git a/src/kudu/security/tls_handshake.h b/src/kudu/security/tls_handshake.h
index d2c17fc..d36e2bf 100644
--- a/src/kudu/security/tls_handshake.h
+++ b/src/kudu/security/tls_handshake.h
@@ -26,7 +26,7 @@
#include "kudu/gutil/port.h"
#include "kudu/security/cert.h"
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
namespace kudu {
diff --git a/src/kudu/security/tls_socket.cc b/src/kudu/security/tls_socket.cc
index 3e63c97..088c8f7 100644
--- a/src/kudu/security/tls_socket.cc
+++ b/src/kudu/security/tls_socket.cc
@@ -31,10 +31,10 @@
#include "kudu/gutil/basictypes.h"
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/errno.h"
#include "kudu/util/net/sockaddr.h"
#include "kudu/util/net/socket.h"
+#include "kudu/util/openssl_util.h"
using std::string;
using strings::Substitute;
diff --git a/src/kudu/security/tls_socket.h b/src/kudu/security/tls_socket.h
index 209eb08..539e172 100644
--- a/src/kudu/security/tls_socket.h
+++ b/src/kudu/security/tls_socket.h
@@ -24,9 +24,9 @@
#include <string>
#include "kudu/gutil/port.h"
-#include "kudu/security/openssl_util.h" // IWYU pragma: keep
#include "kudu/util/faststring.h"
#include "kudu/util/net/socket.h"
+#include "kudu/util/openssl_util.h" // IWYU pragma: keep
#include "kudu/util/status.h"
struct iovec;
diff --git a/src/kudu/security/token-test.cc b/src/kudu/security/token-test.cc
index e0cf0f7..3f1cd32 100644
--- a/src/kudu/security/token-test.cc
+++ b/src/kudu/security/token-test.cc
@@ -30,7 +30,6 @@
#include "kudu/gutil/strings/substitute.h"
#include "kudu/gutil/walltime.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_signing_key.h"
@@ -38,6 +37,7 @@
#include "kudu/util/countdown_latch.h"
#include "kudu/util/logging.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
diff --git a/src/kudu/security/token_signing_key.cc b/src/kudu/security/token_signing_key.cc
index 38d49c6..f9f8d3f 100644
--- a/src/kudu/security/token_signing_key.cc
+++ b/src/kudu/security/token_signing_key.cc
@@ -24,8 +24,8 @@
#include <glog/logging.h>
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/status.h"
using std::unique_ptr;
diff --git a/src/kudu/server/webserver.cc b/src/kudu/server/webserver.cc
index 420984f..dcd9082 100644
--- a/src/kudu/server/webserver.cc
+++ b/src/kudu/server/webserver.cc
@@ -53,7 +53,6 @@
#include "kudu/gutil/strings/strip.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/security/gssapi.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/easy_json.h"
#include "kudu/util/env.h"
#include "kudu/util/flag_tags.h"
@@ -61,6 +60,7 @@
#include "kudu/util/logging.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/string_case.h"
#include "kudu/util/url-coding.h"
#include "kudu/util/version_info.h"
diff --git a/src/kudu/tserver/heartbeater.cc b/src/kudu/tserver/heartbeater.cc
index e3fc80e..713a10f 100644
--- a/src/kudu/tserver/heartbeater.cc
+++ b/src/kudu/tserver/heartbeater.cc
@@ -47,7 +47,6 @@
#include "kudu/rpc/rpc_controller.h"
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/security/cert.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/tls_context.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_verifier.h"
@@ -64,6 +63,7 @@
#include "kudu/util/net/dns_resolver.h"
#include "kudu/util/net/net_util.h"
#include "kudu/util/net/sockaddr.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/status.h"
#include "kudu/util/thread.h"
diff --git a/src/kudu/tserver/tablet_server_authorization-test.cc b/src/kudu/tserver/tablet_server_authorization-test.cc
index 23723d4..69c6ff6 100644
--- a/src/kudu/tserver/tablet_server_authorization-test.cc
+++ b/src/kudu/tserver/tablet_server_authorization-test.cc
@@ -52,7 +52,6 @@
#include "kudu/rpc/rpc_header.pb.h"
#include "kudu/rpc/user_credentials.h"
#include "kudu/security/crypto.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/security/token.pb.h"
#include "kudu/security/token_signer.h"
#include "kudu/security/token_verifier.h"
@@ -67,6 +66,7 @@
#include "kudu/tserver/tserver_service.proxy.h"
#include "kudu/util/memory/arena.h"
#include "kudu/util/monotime.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/pb_util.h"
#include "kudu/util/random.h"
#include "kudu/util/random_util.h"
diff --git a/src/kudu/util/CMakeLists.txt b/src/kudu/util/CMakeLists.txt
index c454a29..ea13742 100644
--- a/src/kudu/util/CMakeLists.txt
+++ b/src/kudu/util/CMakeLists.txt
@@ -215,6 +215,7 @@ set(UTIL_SRCS
nvm_cache.cc
oid_generator.cc
once.cc
+ openssl_util.cc
os-util.cc
path_util.cc
pb_util.cc
@@ -292,6 +293,8 @@ set(UTIL_LIBS
mem_tracker_proto
pb_util_proto
protobuf
+ openssl_crypto
+ openssl_ssl
version_info_proto
yaml
zlib)
diff --git a/src/kudu/util/curl_util.cc b/src/kudu/util/curl_util.cc
index cd73107..8e0756e 100644
--- a/src/kudu/util/curl_util.cc
+++ b/src/kudu/util/curl_util.cc
@@ -28,8 +28,8 @@
#include <glog/logging.h>
#include "kudu/gutil/strings/substitute.h"
-#include "kudu/security/openssl_util.h"
#include "kudu/util/faststring.h"
+#include "kudu/util/openssl_util.h"
#include "kudu/util/scoped_cleanup.h"
using std::string;
diff --git a/src/kudu/security/openssl_util.cc b/src/kudu/util/openssl_util.cc
similarity index 99%
rename from src/kudu/security/openssl_util.cc
rename to src/kudu/util/openssl_util.cc
index 024c7ed..b210f3d 100644
--- a/src/kudu/security/openssl_util.cc
+++ b/src/kudu/util/openssl_util.cc
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
#include <openssl/crypto.h>
#include <openssl/err.h>
diff --git a/src/kudu/security/openssl_util.h b/src/kudu/util/openssl_util.h
similarity index 100%
rename from src/kudu/security/openssl_util.h
rename to src/kudu/util/openssl_util.h
diff --git a/src/kudu/security/openssl_util_bio.h b/src/kudu/util/openssl_util_bio.h
similarity index 99%
rename from src/kudu/security/openssl_util_bio.h
rename to src/kudu/util/openssl_util_bio.h
index 3c41adb..4eff768 100644
--- a/src/kudu/security/openssl_util_bio.h
+++ b/src/kudu/util/openssl_util_bio.h
@@ -17,7 +17,7 @@
#pragma once
-#include "kudu/security/openssl_util.h"
+#include "kudu/util/openssl_util.h"
#include <string>