harald/teepot
1
0
Fork 0
mirror of https://github.com/matter-labs/teepot.git synced 2025-07-21 23:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #114 from matter-labs/rust-1.78

Browse source 
chore(deps): update to rust version 1.78
This commit is contained in:
Harald Hoyer 2024-06-10 14:15:46 +02:00 • committed by GitHub
commit 27f7f3b892
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/tee-vault-admin/src/command.rs
View file

@ -58,7 +58,7 @@ pub async fn post_command(
hasher.update(item.commands.as_bytes()); hasher.update(item.commands.as_bytes());
let hash = hasher.finalize(); let hash = hasher.finalize();
let digest = hex::encode(hash); let digest = hex::encode(hash);
admin_state.last_digest = digest.clone(); admin_state.last_digest.clone_from(&digest);
conn.store_secret(admin_state, "state").await?; conn.store_secret(admin_state, "state").await?;
let mut responds = VaultCommandsResponse { let mut responds = VaultCommandsResponse {

2
bin/tee-vault-admin/src/sign.rs
View file

@ -82,7 +82,7 @@ pub async fn post_sign(
hasher.update(item.sign_request_data.as_bytes()); hasher.update(item.sign_request_data.as_bytes());
let hash = hasher.finalize(); let hash = hasher.finalize();
let digest = hex::encode(hash); let digest = hex::encode(hash);
admin_state.last_digest = digest.clone(); admin_state.last_digest.clone_from(&digest);
conn.store_secret(admin_state, "state").await?; conn.store_secret(admin_state, "state").await?;
// Sign SGX enclave // Sign SGX enclave

1
bin/vault-admin/src/main.rs
View file

@ -291,6 +291,7 @@ async fn send_sig_request(args: SignTeeArgs) -> Result<()> {
// open out_file early to fail fast if it is not writable // open out_file early to fail fast if it is not writable
let mut out_file = OpenOptions::new() let mut out_file = OpenOptions::new()
.create(true) .create(true)
.truncate(true)
.write(true) .write(true)
.open(&args.out)?; .open(&args.out)?;

14
crates/teepot/src/json/http.rs
View file

@ -122,17 +122,17 @@ pub struct AuthDataField {
/// Vault auth /// Vault auth
#[derive(Debug, Default, Serialize, Deserialize)] #[derive(Debug, Default, Serialize, Deserialize)]
pub struct AuthField { pub struct AuthField {
/// TODO /// if the auth token is renewable
pub renewable: bool, pub renewable: bool,
/// TODO /// the lease duration of the auth token
pub lease_duration: isize, pub lease_duration: isize,
/// TODO /// the policies of the auth token
pub policies: Vec<String>, pub policies: Vec<String>,
/// TODO /// the accessor of the auth token
pub accessor: String, pub accessor: String,
/// TODO /// the client token
pub client_token: String, pub client_token: String,
/// TODO /// additional metadata
pub metadata: AuthMetadataField, pub metadata: AuthMetadataField,
} }
@ -141,7 +141,7 @@ pub struct AuthField {
pub struct AuthResponse { pub struct AuthResponse {
/// vault auth /// vault auth
pub auth: AuthField, pub auth: AuthField,
/// /// vault auth data
pub data: AuthDataField, pub data: AuthDataField,
} }

7
flake.lock generated
View file

@ -238,17 +238,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707876656, "lastModified": 1717985971,
"narHash": "sha256-urnZg6e2JjziBosarDB1MnjPeVqcu3PeSqIpqQKYrdg=", "narHash": "sha256-24h/qKp0aeI+Ew13WdRF521kY24PYa5HOvw0mlrABjk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3ad32bb27c700b59306224e285b66577e3532dfc", "rev": "abfe5b3126b1b7e9e4daafc1c6478d17f0b584e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3ad32bb27c700b59306224e285b66577e3532dfc",
"type": "github" "type": "github"
} }
}, },

2
flake.nix
View file

@ -19,7 +19,7 @@
}; };
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay?rev=3ad32bb27c700b59306224e285b66577e3532dfc"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixsgx-flake/nixpkgs"; inputs.nixpkgs.follows = "nixsgx-flake/nixpkgs";
}; };

2
rust-toolchain.toml
View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "1.75" channel = "1.78"
components = ["rustfmt", "clippy", "rust-src"] components = ["rustfmt", "clippy", "rust-src"]