hatter/local-mini-kms
1
1
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

feat: update dependencies

Browse Source
This commit is contained in:
Hatter Jiang
2023-03-25 23:37:27 +08:00
parent 010b8c538f
commit b431a94ef9
4 changed files with 430 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

632
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
Cargo.toml
View File

@@ -9,15 +9,15 @@ edition = "2021"
zeroize = "1.5" zeroize = "1.5"
clap = "2.33" clap = "2.33"
hex = "0.4" hex = "0.4"
base64 = "0.13" base64 = "0.21"
sha2 = "0.10" sha2 = "0.10"
lazy_static = "1.4" lazy_static = "1.4"
serde_derive = "1.0" serde_derive = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
josekit = "0.8" josekit = "0.8"
secmem-proc = "0.1" secmem-proc = "0.3"
seckey = "0.11" seckey = "0.12"
rust_util = { version = "0.6", features = ["use_clap"] } rust_util = { version = "0.6", features = ["use_clap"] }
tokio = { version = "1.19", features = ["full"] } tokio = { version = "1.19", features = ["full"] }
hyper = { version = "0.14", features = ["client", "server", "tcp", "http1", "http2"] } hyper = { version = "0.14", features = ["client", "server", "tcp", "http1", "http2"] }

4
src/cli.rs
View File

@@ -1,4 +1,6 @@
use std::io::Write; use std::io::Write;
use base64::Engine;
use base64::engine::general_purpose::STANDARD;
use clap::{App, Arg, ArgMatches, SubCommand}; use clap::{App, Arg, ArgMatches, SubCommand};
use hyper::{Body, Client, Method, Request, Response, StatusCode}; use hyper::{Body, Client, Method, Request, Response, StatusCode};
@@ -191,7 +193,7 @@ fn do_offline_init(_arg_matches: &ArgMatches<'_>, _sub_arg_matches: &ArgMatches<
hex::decode(&hex)? hex::decode(&hex)?
} else if line.starts_with("base64:") { } else if line.starts_with("base64:") {
let base64: String = line.chars().skip(7).collect(); let base64: String = line.chars().skip(7).collect();
base64::decode(&base64)? STANDARD.decode(&base64)?
} else { } else {
line.as_bytes().to_vec() line.as_bytes().to_vec()
}; };

8
src/serve.rs
View File

@@ -1,5 +1,7 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::Mutex; use std::sync::Mutex;
use base64::Engine;
use base64::engine::general_purpose::STANDARD;
use clap::{App, Arg, ArgMatches, SubCommand}; use clap::{App, Arg, ArgMatches, SubCommand};
use hyper::{Body, Client, Method, Request, Response, Server, StatusCode}; use hyper::{Body, Client, Method, Request, Response, Server, StatusCode};
@@ -160,7 +162,7 @@ impl MultipleViewValue {
Self { Self {
value: Some(String::from_utf8_lossy(v).to_string()), value: Some(String::from_utf8_lossy(v).to_string()),
value_hex: Some(hex::encode(v)), value_hex: Some(hex::encode(v)),
value_base64: Some(base64::encode(v)), value_base64: Some(STANDARD.encode(v)),
} }
} }
@@ -171,7 +173,7 @@ impl MultipleViewValue {
let v = opt_result!(hex::decode(v), "Decode hex failed: {}"); let v = opt_result!(hex::decode(v), "Decode hex failed: {}");
Ok(v) Ok(v)
} else if let Some(v) = &self.value_base64 { } else if let Some(v) = &self.value_base64 {
let v = opt_result!(base64::decode(v), "Decode base64 failed: {}"); let v = opt_result!(STANDARD.decode(v), "Decode base64 failed: {}");
Ok(v) Ok(v)
} else { } else {
simple_error!("Multiple view value is all empty") simple_error!("Multiple view value is all empty")
@@ -275,7 +277,7 @@ async fn inner_init(req: Request<Body>) -> XResult<(StatusCode, Value)> {
} }
let clear_master_key = if let Some(clear_master_key_base64) = &init_request.clear_master_key_base64 { let clear_master_key = if let Some(clear_master_key_base64) = &init_request.clear_master_key_base64 {
base64::decode(clear_master_key_base64)? STANDARD.decode(clear_master_key_base64)?
} else if let Some(clear_master_key_hex) = init_request.clear_master_key_hex { } else if let Some(clear_master_key_hex) = init_request.clear_master_key_hex {
hex::decode(clear_master_key_hex)? hex::decode(clear_master_key_hex)?
} else if let Some(encrypted_master_key) = init_request.encrypted_master_key { } else if let Some(encrypted_master_key) = init_request.encrypted_master_key {