Merge branch 'master' into rg-label

Cargo.toml

@@ -68,6 +68,7 @@ coprocessor_plugin_api = { workspace = true }
 crc32fast = "1.2"
 crc64fast = "0.1"
 crossbeam = "0.8"
+crypto = { workspace = true }
 dashmap = "5"
 encryption_export = { workspace = true }
 engine_panic = { workspace = true }
@@ -78,7 +79,6 @@ engine_traits_tests = { workspace = true }
 error_code = { workspace = true }
 fail = "0.5"
 file_system = { workspace = true }
-fips = { workspace = true }
 flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
 futures = { version = "0.3", features = ["thread-pool", "compat"] }
 futures-executor = "0.3.1"
@@ -129,6 +129,7 @@ raftstore = { workspace = true, features = ["engine_rocks"] }
 raftstore-v2 = { workspace = true }
 rand = "0.7.3"
 regex = "1.3"
+region_cache_memory_engine = { workspace = true }
 resource_control = { workspace = true }
 resource_metering = { workspace = true }
 rev_lines = "0.2.1"
@@ -198,6 +199,9 @@ rusoto_mock = { git = "https://github.com/tikv/rusoto", branch = "gh1482-s3-addr
 rusoto_s3 = { git = "https://github.com/tikv/rusoto", branch = "gh1482-s3-addr-styles" }
 rusoto_sts = { git = "https://github.com/tikv/rusoto", branch = "gh1482-s3-addr-styles" }
 
+# NOTICE: use openssl for signature to support fips 140
+tame-oauth = { git = "https://github.com/tikv/tame-oauth", branch = "fips" }
+
 snappy-sys = { git = "https://github.com/busyjay/rust-snappy.git", branch = "static-link" }
 
 # remove this when https://github.com/danburkert/fs2-rs/pull/42 is merged.
@@ -243,6 +247,7 @@ members = [
   "components/collections",
   "components/concurrency_manager",
   "components/coprocessor_plugin_api",
+  "components/crypto",
   "components/encryption",
   "components/encryption/export",
   "components/engine_rocks_helper",
@@ -252,7 +257,6 @@ members = [
   "components/error_code",
   "components/external_storage",
   "components/file_system",
-  "components/fips",
   "components/into_other",
   "components/keys",
   "components/log_wrappers",
@@ -321,14 +325,15 @@ encryption_export = { path = "components/encryption/export" }
 engine_panic = { path = "components/engine_panic" }
 engine_rocks = { path = "components/engine_rocks" }
 hybrid_engine = { path = "components/hybrid_engine" }
+region_cache_memory_engine = { path = "components/region_cache_memory_engine" }
 engine_rocks_helper = { path = "components/engine_rocks_helper" }
 engine_test = { path = "components/engine_test", default-features = false }
 engine_traits = { path = "components/engine_traits" }
 engine_traits_tests = { path = "components/engine_traits_tests", default-features = false }
 error_code = { path = "components/error_code" }
 external_storage = { path = "components/external_storage" }
 file_system = { path = "components/file_system" }
-fips = { path = "components/fips" }
+crypto = { path = "components/crypto" }
 gcp = { path = "components/cloud/gcp" }
 into_other = { path = "components/into_other" }
 keys = { path = "components/keys" }

cmd/tikv-ctl/Cargo.toml

@@ -49,12 +49,12 @@ clap = "2.32"
 collections = { workspace = true }
 concurrency_manager = { workspace = true }
 crossbeam = "0.8"
+crypto = { workspace = true }
 encryption_export = { workspace = true }
 engine_rocks = { workspace = true }
 engine_traits = { workspace = true }
 error_code = { workspace = true }
 file_system = { workspace = true }
-fips = { workspace = true }
 futures = "0.3"
 gag = "1.0"
 grpcio = { workspace = true }
@@ -72,7 +72,6 @@ raft-engine = { git = "https://github.com/tikv/raft-engine.git" }
 raft-engine-ctl = { git = "https://github.com/tikv/raft-engine.git" }
 raft_log_engine = { workspace = true }
 raftstore = { workspace = true }
-rand = "0.8"
 regex = "1"
 security = { workspace = true }
 serde_json = "1.0"

cmd/tikv-ctl/src/main.rs

@@ -20,6 +20,7 @@ use std::{
 };
 
 use collections::HashMap;
+use crypto::fips;
 use encryption_export::{
     create_backend, data_key_manager_from_config, DataKeyManager, DecrypterReader, Iv,
 };

cmd/tikv-server/Cargo.toml

@@ -34,9 +34,9 @@ pprof-fp = ["tikv/pprof-fp"]
 
 [dependencies]
 clap = "2.32"
+crypto = { workspace = true }
 encryption_export = { workspace = true }
 engine_traits = { workspace = true }
-fips = { workspace = true }
 keys = { workspace = true }
 kvproto = { workspace = true }
 raft-engine = { git = "https://github.com/tikv/raft-engine.git" }